commit efad1853b1aaf33aa3568807b363b56a0a16d194
author Matt Falkenhagen <falken@chromium.org> Sat Jan 12 02:03:30 2019
committer Commit Bot <commit-bot@chromium.org> Sat Jan 12 02:03:30 2019
tree da9f4b65c726f100b3f29dfb358749c398be086c
parent a39e9ff8aa1474c6efc194224b00e0fbe59b4274

extensions: service worker: Reenable some tests on Mac Views.

Speculatively reenabling. The flakiness was probably fixed a while back
in https://crbug.com/879015.

Bug: 845979
Change-Id: If795a5d0e1bd78d77bea5242336fdfcf063ef475
Reviewed-on: https://chromium-review.googlesource.com/c/1402974
Reviewed-by: Istiaque Ahmed <lazyboy@chromium.org>
Commit-Queue: Matt Falkenhagen <falken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#622261}

chrome/browser/extensions/service_worker_apitest.cc

diff --git a/chrome/browser/extensions/service_worker_apitest.cc b/chrome/browser/extensions/service_worker_apitest.cc
index c30f3e9..5d5480b 100644
--- a/chrome/browser/extensions/service_worker_apitest.cc
+++ b/chrome/browser/extensions/service_worker_apitest.cc
@@ -26,7 +26,6 @@
 #include "chrome/browser/push_messaging/push_messaging_service_factory.h"
 #include "chrome/browser/push_messaging/push_messaging_service_impl.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/browser/ui/views_mode_controller.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/api/web_navigation.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ -103,16 +102,6 @@
   DISALLOW_COPY_AND_ASSIGN(WebContentsLoadStopObserver);
 };
 
-bool IsMacViewsMode() {
-// Some tests are flaky on Mac: <https://crbug.com/845979>. This helper function
-// is used to skip them.
-#if defined(OS_MACOSX)
-  return !views_mode_controller::IsViewsBrowserCocoa();
-#else
-  return false;
-#endif
-}
-
 }  // namespace
 
 class ServiceWorkerTest : public ExtensionApiTest,
@@ -1059,8 +1048,6 @@
 }
 
 IN_PROC_BROWSER_TEST_P(ServiceWorkerTest, TabsCreate) {
-  if (IsMacViewsMode())
-    return;
   // Extensions APIs from SW are only enabled on trunk.
   ScopedCurrentChannel current_channel_override(version_info::Channel::UNKNOWN);
   const Extension* extension = LoadExtensionWithFlags(
@@ -1084,8 +1071,6 @@
 }
 
 IN_PROC_BROWSER_TEST_P(ServiceWorkerTest, Events) {
-  if (IsMacViewsMode())
-    return;
   // Extensions APIs from SW are only enabled on trunk.
   ScopedCurrentChannel current_channel_override(version_info::Channel::UNKNOWN);
   const Extension* extension = LoadExtensionWithFlags(
@@ -1395,8 +1380,6 @@
 }
 
 IN_PROC_BROWSER_TEST_P(ServiceWorkerBackgroundSyncTest, Sync) {
-  if (IsMacViewsMode())
-    return;
   const Extension* extension = LoadExtensionWithFlags(
       test_data_dir_.AppendASCII("service_worker/sync"), kFlagNone);
   ASSERT_TRUE(extension);