[Sync] Fix EnableDisableSingleClientTest

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

 // Copyright 2013 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.
 
 #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_
 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_
 
 #include <memory>
 #include <string>
 #include <vector>
@@ skipping 25 matching lines @@
 // the default DISABLED_test_name macro. To disable it from running as an E2E
 // test outside Chromium waterfalls you would need to remove the E2E* macro.
 #define MACRO_CONCAT(prefix, test_name) prefix ## _ ## test_name
 #define E2E_ONLY(test_name) MACRO_CONCAT(DISABLED_E2ETest, test_name)
 #define E2E_ENABLED(test_name) MACRO_CONCAT(test_name, E2ETest)
 
 class ProfileSyncServiceHarness;
 class P2PInvalidationForwarder;
 class P2PSyncRefresher;
 
+namespace arc {
+class SyncArcPackageHelper;
+}  // namespace arc
+
 namespace base {
 class CommandLine;
 class ScopedTempDir;
 }  // namespace base
 
 namespace browser_sync {
 class ProfileSyncService;
 }  // namespace browser_sync
 
 namespace fake_server {
@@ skipping 59 matching lines @@
 
   ~SyncTest() override;
 
   // Validates command line parameters and creates a local python test server if
   // specified.
   void SetUp() override;
 
   // Brings down local python test server if one was created.
   void TearDown() override;
 
+  // Sets up arc flags.
+  void SetUpOnMainThread() override;
+
   // Sets up command line flags required for sync tests.
   void SetUpCommandLine(base::CommandLine* cl) override;
 
   // Used to get the number of sync clients used by a test.
   int num_clients() { return num_clients_; }
 
   // Returns a pointer to a particular sync profile. Callee owns the object
   // and manages its lifetime.
   Profile* GetProfile(int index);
 
@@ skipping 110 matching lines @@
   // Triggers the creation the Synced Bookmarks folder on the server.
   void TriggerCreateSyncedBookmarks();
 
   // Returns the FakeServer being used for the test or null if FakeServer is
   // not being used.
   fake_server::FakeServer* GetFakeServer() const;
 
   // Triggers a sync for the given |model_types| for the Profile at |index|.
   void TriggerSyncForModelTypes(int index, syncer::ModelTypeSet model_types);
 
+  arc::SyncArcPackageHelper* sync_arc_helper() { return sync_arc_helper_; }
+
  protected:
   // Add custom switches needed for running the test.
   virtual void AddTestSwitches(base::CommandLine* cl);
 
   // Append the command line switches to enable experimental types that aren't
   // on by default yet.
   virtual void AddOptionalTypesToCommandLine(base::CommandLine* cl);
 
   // BrowserTestBase override. Destroys all the sync clients and sync
   // profiles created by a test.
@@ skipping 201 matching lines @@
   // Fake URLFetcher factory used to mock out GAIA signin.
   std::unique_ptr<net::FakeURLFetcherFactory> fake_factory_;
 
   // The URLFetcherImplFactory instance used to instantiate |fake_factory_|.
   std::unique_ptr<net::URLFetcherImplFactory> factory_;
 
   // The contents to be written to a profile's Preferences file before the
   // Profile object is created. If empty, no preexisting file will be written.
   std::string preexisting_preferences_file_contents_;
 
+  // ARC test helper function to install/uninstall arc package, and get package
+  // info.
+  arc::SyncArcPackageHelper* sync_arc_helper_;

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

Am I missing something? Why not call arc::SyncArcPackageHelper::GetInstance()
every time instead of holding onto a non-owning copy?

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

Done.

+
   DISALLOW_COPY_AND_ASSIGN(SyncTest);
 };
 
 #endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_