Disable sync in EphemeralAppBrowserTests on Windows due to flakiness

chrome/browser/apps/ephemeral_app_browsertest.cc

Index: chrome/browser/apps/ephemeral_app_browsertest.cc
diff --git a/chrome/browser/apps/ephemeral_app_browsertest.cc b/chrome/browser/apps/ephemeral_app_browsertest.cc
index 86dc13d7b50171e6514e7d4a7f6272b0a9b8f7a9..14389aba0e53b678aebfeba48cb0174e22228e5b 100644
--- a/chrome/browser/apps/ephemeral_app_browsertest.cc
+++ b/chrome/browser/apps/ephemeral_app_browsertest.cc
@@ -61,6 +61,14 @@ namespace alarms = extensions::api::alarms;
 
 const char kPowerTestApp[] = "ephemeral_apps/power";
 
+// Enabling sync causes these tests to be flaky on Windows. Disable sync so that
+// everything else can be tested. See crbug.com/401028

[benwells, 2014/08/26 03:09:54]

This makes me a bit uneasy. Is there some underlying problem that we're
ignoring?

[tmdiep, 2014/08/26 03:44:45]

Yes.
This patch is intended to be a temporary bandaid as I know more of these tests
are flaky, but not yet disabled. I'm leaving the bug open to fix the actual
problem later.

[benwells, 2014/08/26 03:58:12]

OK. It is probably that someone else that should be looking at the underlying
problem. Is it ephemeral app or sync related?

[tmdiep, 2014/08/26 04:29:39]

I think it's sync related. There are other browser tests that have tried to
enable sync, but have also been disabled due to flakiness (setting_apitest.cc).
I'm not sure whether it's due to the same problem, haven't had the chance to
investigate.

We probably just need to mock something in tests.

+#if defined(OS_WIN)
+const bool kEnableSync = false;
+#else
+const bool kEnableSync = true;
+#endif
+
 typedef std::vector<message_center::Notifier*> NotifierList;
 
 bool IsNotifierInList(const message_center::NotifierId& notifier_id,
@@ -505,6 +513,9 @@ class EphemeralAppBrowserTest : public EphemeralAppTestBase {
   }
 
   void InitSyncService() {
+    if (!kEnableSync)
+      return;
+
     ExtensionSyncService* sync_service = ExtensionSyncService::Get(profile());
     sync_service->MergeDataAndStartSyncing(
         syncer::APPS,
@@ -530,6 +541,9 @@ class EphemeralAppBrowserTest : public EphemeralAppTestBase {
   }
 
   void VerifySyncChange(const AppSyncData* sync_change, bool expect_enabled) {
+    if (!kEnableSync)
+      return;
+
     ASSERT_TRUE(sync_change);
     EXPECT_TRUE(sync_change->page_ordinal().IsValid());
     EXPECT_TRUE(sync_change->app_launch_ordinal().IsValid());
@@ -915,16 +929,8 @@ IN_PROC_BROWSER_TEST_F(EphemeralAppBrowserTest,
 // permanently install an ephemeral app. However, there may be cases where an
 // install occurs through the usual route of installing from the Web Store (due
 // to race conditions). Ensure that the app is still installed correctly.
-#if defined(OS_WIN)
-// Disabled on Windows due to failures. See crbug.com/401028
-#define MAYBE_ReplaceEphemeralAppWithInstalledApp \
-    DISABLED_ReplaceEphemeralAppWithInstalledApp
-#else
-#define MAYBE_ReplaceEphemeralAppWithInstalledApp \
-    ReplaceEphemeralAppWithInstalledApp
-#endif
 IN_PROC_BROWSER_TEST_F(EphemeralAppBrowserTest,
-                       MAYBE_ReplaceEphemeralAppWithInstalledApp) {
+                       ReplaceEphemeralAppWithInstalledApp) {
   InitSyncService();
 
   const Extension* app = InstallAndLaunchEphemeralApp(kNotificationsTestApp);
@@ -946,16 +952,8 @@ IN_PROC_BROWSER_TEST_F(EphemeralAppBrowserTest,
 
 // This is similar to ReplaceEphemeralAppWithInstalledApp, but installs will
 // be delayed until the app is idle.
-#if defined(OS_WIN)
-// Disabled on Windows due to failures. See crbug.com/401028
-#define MAYBE_ReplaceEphemeralAppWithDelayedInstalledApp \
-    DISABLED_ReplaceEphemeralAppWithDelayedInstalledApp
-#else
-#define MAYBE_ReplaceEphemeralAppWithDelayedInstalledApp \
-    ReplaceEphemeralAppWithDelayedInstalledApp
-#endif
 IN_PROC_BROWSER_TEST_F(EphemeralAppBrowserTest,
-                       MAYBE_ReplaceEphemeralAppWithDelayedInstalledApp) {
+                       ReplaceEphemeralAppWithDelayedInstalledApp) {
   InitSyncService();
   const Extension* app = InstallAndLaunchEphemeralApp(kNotificationsTestApp);
   ASSERT_TRUE(app);