[Sync] Fix EnableDisableSingleClientTest

chrome/browser/sync/test/integration/enable_disable_test.cc

Index: chrome/browser/sync/test/integration/enable_disable_test.cc
diff --git a/chrome/browser/sync/test/integration/enable_disable_test.cc b/chrome/browser/sync/test/integration/enable_disable_test.cc
index a76f61c1e3aa70af066ad67887f3eafb4ff54904..d39871ceac0511cf83e7da221e4f019dede2d563 100644
--- a/chrome/browser/sync/test/integration/enable_disable_test.cc
+++ b/chrome/browser/sync/test/integration/enable_disable_test.cc
@@ -158,13 +158,7 @@ class EnableDisableSingleClientTest : public SyncTest {
   DISALLOW_COPY_AND_ASSIGN(EnableDisableSingleClientTest);
 };
 
-// crbug.com/689662
-#if defined(OS_CHROMEOS)
-#define MAYBE_EnableOneAtATime DISABLED_EnableOneAtATime
-#else
-#define MAYBE_EnableOneAtATime EnableOneAtATime
-#endif
-IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, MAYBE_EnableOneAtATime) {
+IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, EnableOneAtATime) {

[skym, 2017/03/14 21:39:06]

Why are these tests being fixed by this change? Am I correct to assume that
arc::IsArcAllowedForProfile() returns false for these two tests? Wouldn't we
prefer these tests to include ARC_PACKAGE? Is there some setup call we need to
make to make these work instead?

[Gang Wu, 2017/03/15 07:55:45]

Before this change, sync client always create ARC controller whenever ARC is
enabled or not. SyncService has the controller, but client cannot enable the ARC
service.
After this change, client will only create controller when service can be
enabled.

[skym, 2017/03/15 15:45:58]

What I was trying to say is that you're fixing these tests by not registering
the controller. I'd prefer you to fix them by registering the controller and
enabling the ARC machinery.

I have nothing against the selective registration of the ARC controller, but I
want these tests to register it.

[Gang Wu, 2017/03/16 18:40:30]

Done.

   // Setup sync with no enabled types.
   SetupTest(false);
 
@@ -186,13 +180,7 @@ IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, MAYBE_EnableOneAtATime) {
   }
 }
 
-// crbug.com/689662
-#if defined(OS_CHROMEOS)
-#define MAYBE_DisableOneAtATime DISABLED_DisableOneAtATime
-#else
-#define MAYBE_DisableOneAtATime DisableOneAtATime
-#endif
-IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, MAYBE_DisableOneAtATime) {
+IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, DisableOneAtATime) {
   // Setup sync with no disabled types.
   SetupTest(true);