[Sync] Fix EnableDisableSingleClientTest

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

Index: chrome/browser/sync/test/integration/sync_test.cc
diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc
index 64cc0210c74bf66ebdc6ef7fc0dea9b4d2217b45..fd108c052318c62e796dd4ae5f32b4aaaca7c60e 100644
--- a/chrome/browser/sync/test/integration/sync_test.cc
+++ b/chrome/browser/sync/test/integration/sync_test.cc
@@ -89,7 +89,10 @@
 #include "url/gurl.h"
 
 #if defined(OS_CHROMEOS)
+#include "chrome/browser/sync/test/integration/sync_arc_package_helper.h"
+#include "chrome/browser/ui/app_list/arc/arc_app_list_prefs_factory.h"
 #include "chromeos/chromeos_switches.h"
+#include "components/arc/arc_util.h"
 #endif
 
 using browser_sync::ProfileSyncService;
@@ -298,6 +301,7 @@ void SyncTest::SetUpCommandLine(base::CommandLine* cl) {
 
 #if defined(OS_CHROMEOS)
   cl->AppendSwitch(chromeos::switches::kIgnoreUserProfileMappingForTests);
+  arc::SetArcAvailableCommandLineForTesting(cl);
 #endif
 }
 
@@ -513,6 +517,15 @@ bool SyncTest::SetupClients() {
       LOG(FATAL) << "Could not create Gaia account.";
   }
 
+#if defined(OS_CHROMEOS)
+  const auto* cl = base::CommandLine::ForCurrentProcess();
+  // ARC_PACKAGE do not support supervised users, switches::kSupervisedUserId
+  // need to be set in SetUpCommandLine() when a test will use supervise users.
+  if (!cl->HasSwitch(switches::kSupervisedUserId))

[skym, 2017/03/17 19:51:17]

can you add a { } here, the comment makes this weird to not have { }

[Gang Wu, 2017/03/17 20:00:29]

Done.

+    // Sets Arc flags, need to be called before create test profiles.
+    ArcAppListPrefsFactory::SetFactoryForSyncTest();
+#endif
+
   for (int i = 0; i < num_clients_; ++i) {
     CreateProfile(i);
   }
@@ -531,6 +544,16 @@ bool SyncTest::SetupClients() {
         user_data_dir.Append(FILE_PATH_LITERAL("Verifier")), num_clients_);
     WaitForDataModels(verifier());
   }
+
+#if defined(OS_CHROMEOS)
+  if (ArcAppListPrefsFactory::IsFactorySetForSyncTest()) {
+    // Init SyncArcPackageHelper to ensure that the arc services are initialized
+    // for each Profile, only can be called after test profiles are created.
+    if (!sync_arc_helper())
+      return false;
+  }
+#endif
+
   // Error cases are all handled by LOG(FATAL) messages. So there is not really
   // a case that returns false.  In case we failed to create a verifier profile,
   // any call to the verifier() would fail.
@@ -1173,6 +1196,14 @@ void SyncTest::TriggerSyncForModelTypes(int index,
   GetSyncService(index)->TriggerRefresh(model_types);
 }
 
+arc::SyncArcPackageHelper* SyncTest::sync_arc_helper() {
+#if defined(OS_CHROMEOS)
+  return arc::SyncArcPackageHelper::GetInstance();
+#else
+  return nullptr;
+#endif
+}
+
 void SyncTest::SetPreexistingPreferencesFileContents(
     const std::string& contents) {
   preexisting_preferences_file_contents_ = contents;