[Sync] Fix EnableDisableSingleClientTest

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

Index: chrome/browser/sync/test/integration/single_client_arc_package_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/single_client_arc_package_sync_test.cc b/chrome/browser/sync/test/integration/single_client_arc_package_sync_test.cc
index f2a008e78ffe129f3eb7ce53030adbd54db276ff..5fb85626358282a62003e7419a72ea52116a046c 100644
--- a/chrome/browser/sync/test/integration/single_client_arc_package_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_arc_package_sync_test.cc
@@ -6,9 +6,7 @@
 #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 arc {
 
@@ -23,43 +21,11 @@ bool AllProfilesHaveSameArcPackageDetails() {
 
 class SingleClientArcPackageSyncTest : public SyncTest {
  public:
-  SingleClientArcPackageSyncTest()
-      : SyncTest(SINGLE_CLIENT), sync_helper_(nullptr) {}
+  SingleClientArcPackageSyncTest() : SyncTest(SINGLE_CLIENT) {}
 
   ~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_ = 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);
 };
 
@@ -75,8 +41,8 @@ IN_PROC_BROWSER_TEST_F(SingleClientArcPackageSyncTest,
 
   constexpr size_t kNumPackages = 5;
   for (size_t i = 0; i < kNumPackages; ++i) {
-    sync_helper()->InstallPackageWithIndex(GetProfile(0), i);
-    sync_helper()->InstallPackageWithIndex(verifier(), i);
+    sync_arc_helper()->InstallPackageWithIndex(GetProfile(0), i);
+    sync_arc_helper()->InstallPackageWithIndex(verifier(), i);
   }
 
   ASSERT_TRUE(UpdatedProgressMarkerChecker(GetSyncService(0)).Wait());