[Sync] Fix EnableDisableSingleClientTest

chrome/browser/sync/test/integration/sync_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 "chrome/browser/sync/test/integration/sync_test.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <limits>
@@ skipping 71 matching lines @@
 #include "net/base/load_flags.h"
 #include "net/base/network_change_notifier.h"
 #include "net/base/port_util.h"
 #include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #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;
 using content::BrowserThread;
 
 namespace switches {
 const char kPasswordFileForTest[] = "password-file-for-test";
 const char kSyncUserForTest[] = "sync-user-for-test";
 const char kSyncPasswordForTest[] = "sync-password-for-test";
 const char kSyncServerCommandLine[] = "sync-server-command-line";
@@ skipping 103 matching lines @@
 }
 
 }  // namespace
 
 SyncTest::SyncTest(TestType test_type)
     : test_type_(test_type),
       server_type_(SERVER_TYPE_UNDECIDED),
       num_clients_(-1),
       use_verifier_(true),
       notifications_enabled_(true),
-      create_gaia_account_at_runtime_(false) {
+      create_gaia_account_at_runtime_(false),
+      sync_arc_helper_(nullptr) {
   sync_datatype_helper::AssociateWithTest(this);
   switch (test_type_) {
     case SINGLE_CLIENT:
     case SINGLE_CLIENT_LEGACY: {
       num_clients_ = 1;
       break;
     }
     case TWO_CLIENT:
     case TWO_CLIENT_LEGACY: {
       num_clients_ = 2;
@@ skipping 58 matching lines @@
 
   // Stop the local sync test server. This is a no-op if one wasn't started.
   TearDownLocalTestServer();
 
   // Return OSCrypt to its real behaviour
   OSCryptMocker::TearDown();
 
   fake_server_.reset();
 }
 
+void SyncTest::SetUpOnMainThread() {
+#if defined(OS_CHROMEOS)
+  const auto* cl = base::CommandLine::ForCurrentProcess();
+  // Sets up for ARC_PACKAGE.
+  if (!cl->HasSwitch(switches::kSupervisedUserId))

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

add this because "Supervised users are not supported in ARC." from
arc_util.cc:59, 

[skym, 2017/03/16 23:27:19]

Can you put that into a comment?

[Gang Wu, 2017/03/17 19:23:23]

Done.

+    ArcAppListPrefsFactory::SetFactoryForSyncTest();
+#endif
+}
+
 void SyncTest::SetUpCommandLine(base::CommandLine* cl) {
   AddTestSwitches(cl);
   AddOptionalTypesToCommandLine(cl);
 
 #if defined(OS_CHROMEOS)
   cl->AppendSwitch(chromeos::switches::kIgnoreUserProfileMappingForTests);
+  arc::SetArcAvailableCommandLineForTesting(cl);
 #endif
 }
 
 void SyncTest::AddTestSwitches(base::CommandLine* cl) {
   // Disable non-essential access of external network resources.
   if (!cl->HasSwitch(switches::kDisableBackgroundNetworking))
     cl->AppendSwitch(switches::kDisableBackgroundNetworking);
 
   if (!cl->HasSwitch(switches::kSyncShortInitialRetryOverride))
     cl->AppendSwitch(switches::kSyncShortInitialRetryOverride);
@@ skipping 213 matching lines @@
   // Create the verifier profile.
   if (use_verifier_) {
     base::FilePath user_data_dir;
     PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
     profile_delegates_[num_clients_] =
         base::MakeUnique<SyncProfileDelegate>(base::Callback<void(Profile*)>());
     verifier_ = MakeTestProfile(
         user_data_dir.Append(FILE_PATH_LITERAL("Verifier")), num_clients_);
     WaitForDataModels(verifier());
   }
+
+#if defined(OS_CHROMEOS)
+  // Init SyncArcPackageHelper to ensure that the arc services are initialized
+  // for each Profile.
+  const auto* cl = base::CommandLine::ForCurrentProcess();
+  if (!cl->HasSwitch(switches::kSupervisedUserId)) {

[skym, 2017/03/16 23:27:19]

I've seen this check before! Can you unify them? Also, it'd be interesting to
mention in a comment how early this kSupervisedUserId flag is getting set, and
why this is safe.

[Gang Wu, 2017/03/17 19:23:23]

cannot combine two code together,
ArcAppListPrefsFactory::SetFactoryForSyncTest() need to be called before create
profile, and create helper need to be called after profile set up. but I move
them closer to easier understand.

+    sync_arc_helper_ = arc::SyncArcPackageHelper::GetInstance();
+    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.
   return true;
 }
 
 void SyncTest::InitializeProfile(int index, Profile* profile) {
   DCHECK(profile);
   profiles_[index] = profile;
 
@@ skipping 637 matching lines @@
 bool SyncTest::ClearServerData(ProfileSyncServiceHarness* harness) {
   // At this point our birthday is good.
   base::RunLoop run_loop;
   harness->service()->ClearServerDataForTest(run_loop.QuitClosure());
   run_loop.Run();
 
   // Our birthday is invalidated on the server here so restart sync to get
   // the new birthday from the server.
   return harness->RestartSyncService();
 }