[Sheriff] Re-enable tests that only fail on lacros bots

Tests marked as experimental in the lacros bot (crrev.com/c/2341931), so we they don't need to be disabled. TBR=svenzheng@chromium.org Bug: 1113695 Change-Id: Idaf81bf6b03fbd45a509b7d51588f2cbf0f6e244 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2341159 Commit-Queue: Fabio Tirelo <ftirelo@chromium.org> Reviewed-by: Sven Zheng <svenzheng@chromium.org> Reviewed-by: Fabio Tirelo <ftirelo@chromium.org> Cr-Commit-Position: refs/heads/master@{#795670}
FairyWorld · Aug 6, 2020 · 5d60623 · 5d60623
1 parent a55fcb0
commit 5d60623
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 85 deletions.
diff --git a/chrome/browser/extensions/api/web_request/web_request_apitest.cc b/chrome/browser/extensions/api/web_request/web_request_apitest.cc
@@ -1594,13 +1594,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest,
 
 // Test that the webRequest events are dispatched for the WebSocket handshake
 // requests.
-#if defined(OS_CHROMEOS)
-// TODO(http://crbug.com/1113845): flaky on ChromeOS.
-#define MAYBE_WebSocketRequest DISABLED_WebSocketRequest
-#else
-#define MAYBE_WebSocketRequest WebSocketRequest
-#endif
-IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, MAYBE_WebSocketRequest) {
+IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebSocketRequest) {
   ASSERT_TRUE(StartEmbeddedTestServer());
   ASSERT_TRUE(StartWebSocketServer(net::GetWebSocketTestDataDirectory()));
   ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_websocket.html"))

diff --git a/...wser/page_load_metrics/observers/ad_metrics/ads_page_load_metrics_observer_browsertest.cc b/...wser/page_load_metrics/observers/ad_metrics/ads_page_load_metrics_observer_browsertest.cc
@@ -250,14 +250,8 @@ IN_PROC_BROWSER_TEST_F(AdsPageLoadMetricsObserverBrowserTest,
 // a page's lifecycling by creating a large ad frame, destroying it, and
 // creating a smaller iframe. The ad density recorded is the density with
 // the first larger frame.
-#if defined(OS_CHROMEOS)
-// TODO(http://crbug.com/1113692): flaky on ChromeOS.
-#define MAYBE_PageAdDensityRecordsPageMax DISABLED_PageAdDensityRecordsPageMax
-#else
-#define MAYBE_PageAdDensityRecordsPageMax PageAdDensityRecordsPageMax
-#endif
 IN_PROC_BROWSER_TEST_F(AdsPageLoadMetricsObserverBrowserTest,
-                       MAYBE_PageAdDensityRecordsPageMax) {
+                       PageAdDensityRecordsPageMax) {
   base::HistogramTester histogram_tester;
   ukm::TestAutoSetUkmRecorder ukm_recorder;
   auto waiter = CreatePageLoadMetricsTestWaiter();
@@ -430,16 +424,8 @@ IN_PROC_BROWSER_TEST_F(AdsPageLoadMetricsObserverBrowserTest,
 
 // Creates a frame with display:none styling and verifies that it has an
 // empty intersection with the main frame.
-#if defined(OS_CHROMEOS)
-// TODO(http://crbug.com/1113696): flaky on ChromeOS.
-#define MAYBE_PageAdDensityIgnoreDisplayNoneFrame \
-  DISABLED_PageAdDensityIgnoreDisplayNoneFrame
-#else
-#define MAYBE_PageAdDensityIgnoreDisplayNoneFrame \
-  PageAdDensityIgnoreDisplayNoneFrame
-#endif
 IN_PROC_BROWSER_TEST_F(AdsPageLoadMetricsObserverBrowserTest,
-                       MAYBE_PageAdDensityIgnoreDisplayNoneFrame) {
+                       PageAdDensityIgnoreDisplayNoneFrame) {
   base::HistogramTester histogram_tester;
   ukm::TestAutoSetUkmRecorder ukm_recorder;
   auto waiter = CreatePageLoadMetricsTestWaiter();

diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc b/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc
@@ -1531,13 +1531,7 @@ IN_PROC_BROWSER_TEST_F(ContextMenuBrowserTest, GifImageShare) {
       gfx::Size(276, 110), gfx::Size(276, 110), ".gif");
 }
 
-#if defined(OS_CHROMEOS)
-// TODO(http://crbug.com/1113835): flaky on ChromeOS.
-#define MAYBE_GifImageDownscaleToJpeg DISABLED_GifImageDownscaleToJpeg
-#else
-#define MAYBE_GifImageDownscaleToJpeg GifImageDownscaleToJpeg
-#endif
-IN_PROC_BROWSER_TEST_F(ContextMenuBrowserTest, MAYBE_GifImageDownscaleToJpeg) {
+IN_PROC_BROWSER_TEST_F(ContextMenuBrowserTest, GifImageDownscaleToJpeg) {
   OpenImagePageAndContextMenu("/google/logo.gif");
   RequestImageAndVerifyResponse(
       gfx::Size(100, 100), chrome::mojom::ImageFormat::ORIGINAL,

diff --git a/chrome/browser/resource_coordinator/tab_activity_watcher_browsertest.cc b/chrome/browser/resource_coordinator/tab_activity_watcher_browsertest.cc
@@ -510,14 +510,7 @@ IN_PROC_BROWSER_TEST_F(TabActivityWatcherTestWithBackgroundLogEnabled,
 
 // Tests that all window metrics are logged with correct value which are
 // different from their default values in TabFeatures.
-#if defined(OS_CHROMEOS)
-// TODO(http://crbug.com/1113702): flaky on ChromeOS.
-#define MAYBE_AllWindowMetricsArePopulated DISABLED_AllWindowMetricsArePopulated
-#else
-#define MAYBE_AllWindowMetricsArePopulated AllWindowMetricsArePopulated
-#endif
-IN_PROC_BROWSER_TEST_F(TabActivityWatcherTest,
-                       MAYBE_AllWindowMetricsArePopulated) {
+IN_PROC_BROWSER_TEST_F(TabActivityWatcherTest, AllWindowMetricsArePopulated) {
   ui_test_utils::NavigateToURL(browser(), test_urls_[0]);
 
   // Adding a new foreground tab logs the previously active tab.

diff --git a/chrome/browser/ui/browser_navigator_browsertest.cc b/chrome/browser/ui/browser_navigator_browsertest.cc
@@ -789,13 +789,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, SwitchToTabCorrectWindow) {
 
 // This test verifies that "switch to tab" prefers the latest used browser,
 // if multiple exist.
-#if defined(OS_CHROMEOS)
-// TODO(http://crbug.com/1113694): flaky on ChromeOS.
-#define MAYBE_SwitchToTabLatestWindow DISABLED_SwitchToTabLatestWindow
-#else
-#define MAYBE_SwitchToTabLatestWindow SwitchToTabLatestWindow
-#endif
-IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, MAYBE_SwitchToTabLatestWindow) {
+IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, SwitchToTabLatestWindow) {
   // Navigate to a site.
   NavigateHelper(GURL("http://maps.google.com/"), browser(),
                  WindowOpenDisposition::CURRENT_TAB, true);

diff --git a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
@@ -933,14 +933,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest,
 // This tests that opening multiple profiles with session restore enabled,
 // shutting down, and then launching with kNoStartupWindow doesn't restore
 // the previously opened profiles.
-#if defined(OS_CHROMEOS)
-// TODO(http://crbug.com/1113700): flaky on ChromeOS.
-#define MAYBE_RestoreWithNoStartupWindow DISABLED_RestoreWithNoStartupWindow
-#else
-#define MAYBE_RestoreWithNoStartupWindow RestoreWithNoStartupWindow
-#endif
-IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest,
-                       MAYBE_RestoreWithNoStartupWindow) {
+IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, RestoreWithNoStartupWindow) {
   ASSERT_TRUE(embedded_test_server()->Start());
 
   ProfileManager* profile_manager = g_browser_process->profile_manager();

diff --git a/chrome/browser/ui/views/folder_upload_confirmation_view_browsertest.cc b/chrome/browser/ui/views/folder_upload_confirmation_view_browsertest.cc
@@ -55,14 +55,8 @@ class FolderUploadConfirmationViewTest : public DialogBrowserTest {
   DISALLOW_COPY_AND_ASSIGN(FolderUploadConfirmationViewTest);
 };
 
-#if defined(OS_CHROMEOS)
-// TODO(http://crbug.com/1113695): flaky on ChromeOS.
-#define MAYBE_InitiallyFocusesCancel DISABLED_InitiallyFocusesCancel
-#else
-#define MAYBE_InitiallyFocusesCancel InitiallyFocusesCancel
-#endif
 IN_PROC_BROWSER_TEST_F(FolderUploadConfirmationViewTest,
-                       MAYBE_InitiallyFocusesCancel) {
+                       InitiallyFocusesCancel) {
   ShowUi(std::string());
   EXPECT_EQ(widget_->widget_delegate()->AsDialogDelegate()->GetCancelButton(),
             widget_->GetFocusManager()->GetFocusedView());

diff --git a/chrome/browser/ui/views/intent_picker_bubble_view_browsertest.cc b/chrome/browser/ui/views/intent_picker_bubble_view_browsertest.cc
@@ -104,17 +104,9 @@ IN_PROC_BROWSER_TEST_P(IntentPickerBubbleViewBrowserTest,
 // Tests that clicking a link from an app browser to either within or outside
 // the scope of an installed app does not show the intent picker, even when an
 // outside of scope link is opened within the context of the PWA.
-#if defined(OS_CHROMEOS)
-// TODO(http://crbug.com/1113821): flaky on ChromeOS.
-#define MAYBE_NavigationInAppWindowToInScopeLinkDoesNotShowIntentPicker \
-  DISABLED_NavigationInAppWindowToInScopeLinkDoesNotShowIntentPicker
-#else
-#define MAYBE_NavigationInAppWindowToInScopeLinkDoesNotShowIntentPicker \
-  NavigationInAppWindowToInScopeLinkDoesNotShowIntentPicker
-#endif
 IN_PROC_BROWSER_TEST_P(
     IntentPickerBubbleViewBrowserTest,
-    MAYBE_NavigationInAppWindowToInScopeLinkDoesNotShowIntentPicker) {
+    NavigationInAppWindowToInScopeLinkDoesNotShowIntentPicker) {
   InstallTestWebApp();
 
   // No intent picker should be seen when first opening the web app.

diff --git a/chrome/browser/ui/views/location_bar/custom_tab_bar_view_browsertest.cc b/chrome/browser/ui/views/location_bar/custom_tab_bar_view_browsertest.cc
@@ -250,13 +250,7 @@ IN_PROC_BROWSER_TEST_P(CustomTabBarViewBrowserTest,
 }
 
 // Check the custom tab bar is not instantiated for a popup window.
-#if defined(OS_CHROMEOS)
-// TODO(http://crbug.com/1113821): flaky on ChromeOS.
-#define MAYBE_IsNotCreatedInPopup DISABLED_IsNotCreatedInPopup
-#else
-#define MAYBE_IsNotCreatedInPopup IsNotCreatedInPopup
-#endif
-IN_PROC_BROWSER_TEST_P(CustomTabBarViewBrowserTest, MAYBE_IsNotCreatedInPopup) {
+IN_PROC_BROWSER_TEST_P(CustomTabBarViewBrowserTest, IsNotCreatedInPopup) {
   Browser* popup = OpenPopup(browser_view_->GetActiveWebContents(),
                              GURL("http://example.com"));
   EXPECT_TRUE(popup);

diff --git a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view_browsertest.cc b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view_browsertest.cc
@@ -358,16 +358,8 @@ IN_PROC_BROWSER_TEST_F(OmniboxPopupContentsViewTest, MAYBE_ClickOmnibox) {
 // Check that the location bar background (and the background of the textfield
 // it contains) changes when it receives focus, and matches the popup background
 // color.
-#if defined(OS_CHROMEOS)
-// TODO(http://crbug.com/1113839): flaky on ChromeOS.
-#define MAYBE_PopupMatchesLocationBarBackground \
-  DISABLED_PopupMatchesLocationBarBackground
-#else
-#define MAYBE_PopupMatchesLocationBarBackground \
-  PopupMatchesLocationBarBackground
-#endif
 IN_PROC_BROWSER_TEST_F(OmniboxPopupContentsViewTest,
-                       MAYBE_PopupMatchesLocationBarBackground) {
+                       PopupMatchesLocationBarBackground) {
   // In dark mode the omnibox focused and unfocused colors are the same, which
   // makes this test fail; see comments below.
   BrowserView::GetBrowserViewForBrowser(browser())