Fix Arc integration test.

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

 // Copyright 2016 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/profiles/profile.h"
 #include "chrome/browser/sync/test/integration/sync_arc_package_helper.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "chrome/browser/sync/test/integration/updated_progress_marker_checker.h"
+#include "chrome/browser/ui/app_list/arc/arc_app_list_prefs_factory.h"
 #include "chrome/browser/ui/app_list/arc/arc_package_syncable_service.h"
+#include "components/arc/arc_util.h"
+
+namespace base {

[hidehiko, 2017/03/03 12:55:56]

nit: looks unnecessary? Argument type of overrding function is a part of
parent's signature, I think?

[lgcheng, 2017/03/03 18:39:53]

Done.

+class CommandLine;
+}
 
 namespace arc {
 
 namespace {
 
 bool AllProfilesHaveSameArcPackageDetails() {
   return SyncArcPackageHelper::GetInstance()
       ->AllProfilesHaveSamePackageDetails();
 }
 
 }  // namespace
 
 class SingleClientArcPackageSyncTest : public SyncTest {
  public:
   SingleClientArcPackageSyncTest()
       : SyncTest(SINGLE_CLIENT), sync_helper_(nullptr) {}
 
   ~SingleClientArcPackageSyncTest() override {}
 
   bool SetupClients() override {
     if (!SyncTest::SetupClients())
       return false;
 
     // Init SyncArcPackageHelper to ensure that the arc services are initialized
     // for each Profile.
     sync_helper_ = SyncArcPackageHelper::GetInstance();
     return sync_helper_ != nullptr;
   }
 
+  void SetUpOnMainThread() override {
+    // This setting does not affect the profile created by InProcessBrowserTest.
+    // Only sync test profiles are affected.
+    ArcAppListPrefsFactory::SetFactoryForSyncTest();
+  }
+
   void TearDownOnMainThread() override {
-    sync_helper_->CleanUp();
     sync_helper_ = nullptr;
     SyncTest::TearDownOnMainThread();
   }
 
+  // Sets up command line flags required for Arc sync tests.
+  void SetUpCommandLine(base::CommandLine* cl) override {
+    SetArcAvailableCommandLineForTesting(cl);
+    SyncTest::SetUpCommandLine(cl);
+  }
+
   SyncArcPackageHelper* sync_helper() { return sync_helper_; }
 
  private:
   SyncArcPackageHelper* sync_helper_;
 
   DISALLOW_COPY_AND_ASSIGN(SingleClientArcPackageSyncTest);
 };
 
 IN_PROC_BROWSER_TEST_F(SingleClientArcPackageSyncTest, ArcPackageEmpty) {
   ASSERT_TRUE(SetupSync());
 
   ASSERT_TRUE(AllProfilesHaveSameArcPackageDetails());
 }
 
 IN_PROC_BROWSER_TEST_F(SingleClientArcPackageSyncTest,
                        ArcPackageInstallSomePackages) {
   ASSERT_TRUE(SetupSync());
 
   constexpr size_t kNumPackages = 5;
   for (size_t i = 0; i < kNumPackages; ++i) {
     sync_helper()->InstallPackageWithIndex(GetProfile(0), i);
     sync_helper()->InstallPackageWithIndex(verifier(), i);
   }
 
   ASSERT_TRUE(UpdatedProgressMarkerChecker(GetSyncService(0)).Wait());
   ASSERT_TRUE(AllProfilesHaveSameArcPackageDetails());
 }
 
 }  // namespace arc