[Sync] Fix EnableDisableSingleClientTest

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/macros.h"
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "components/browser_sync/profile_sync_service.h"
 #include "components/sync/base/model_type.h"
 #include "components/sync/base/sync_prefs.h"
@@ skipping 140 matching lines @@
   ModelTypeSet registered_types_;
   ModelTypeSet selectable_types_;
   ModelTypeSet multi_grouped_types_;
   ModelTypeSet registered_directory_types_;
   ModelTypeSet registered_selectable_types_;
 
  private:
   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);
 
   for (ModelTypeSet::Iterator si = selectable_types_.First(); si.Good();
        si.Inc()) {
     const ModelTypeSet grouped_types = ResolveGroup(si.Get());
     const ModelTypeSet single_grouped_types = WithoutMultiTypes(grouped_types);
     for (ModelTypeSet::Iterator sgi = single_grouped_types.First(); sgi.Good();
          sgi.Inc()) {
       VerifyExistence(user_share_, false, sgi.Get(), si.Get());
     }
 
     EXPECT_TRUE(GetClient(0)->EnableSyncForDatatype(si.Get()));
 
     for (ModelTypeSet::Iterator gi = grouped_types.First(); gi.Good();
          gi.Inc()) {
       VerifyExistence(user_share_, true, gi.Get(), si.Get());
     }
   }
 }
 
-// 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);
 
   // Make sure all top-level nodes exist first.
   for (ModelTypeSet::Iterator rdi = registered_directory_types_.First();
        rdi.Good(); rdi.Inc()) {
     EXPECT_TRUE(DoesTopLevelNodeExist(user_share_, rdi.Get()) ||
                 IsUnready(data_type_status_table_, rdi.Get()))
         << ModelTypeToString(rdi.Get());
   }
@@ skipping 17 matching lines @@
 
   // Lastly make sure that all the multi grouped times are all gone, since we
   // did not check these after disabling inside the above loop.
   for (ModelTypeSet::Iterator mgi = multi_grouped_types_.First(); mgi.Good();
        mgi.Inc()) {
     VerifyExistence(user_share_, false, mgi.Get());
   }
 }
 
 }  // namespace