Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3670)

Unified Diff: chrome/browser/sync/test/integration/sync_test.h

Issue 2740363002: [Sync] Fix EnableDisableSingleClientTest (Closed)
Patch Set: fix Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/test/integration/sync_test.h
diff --git a/chrome/browser/sync/test/integration/sync_test.h b/chrome/browser/sync/test/integration/sync_test.h
index da2ac60d9a4f83090ea9a3676fd5c96ab6be5e32..642c086500cac76aa3ee18322e38d4d356b4140a 100644
--- a/chrome/browser/sync/test/integration/sync_test.h
+++ b/chrome/browser/sync/test/integration/sync_test.h
@@ -43,6 +43,10 @@ class ProfileSyncServiceHarness;
class P2PInvalidationForwarder;
class P2PSyncRefresher;
+namespace arc {
+class SyncArcPackageHelper;
+} // namespace arc
+
namespace base {
class CommandLine;
class ScopedTempDir;
@@ -122,6 +126,9 @@ class SyncTest : public InProcessBrowserTest {
// 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;
@@ -252,6 +259,8 @@ class SyncTest : public InProcessBrowserTest {
// 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);
@@ -473,6 +482,10 @@ class SyncTest : public InProcessBrowserTest {
// 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::SyncArcP
Gang Wu 2017/03/17 19:23:23 Done.
+
DISALLOW_COPY_AND_ASSIGN(SyncTest);
};

Powered by Google App Engine
This is Rietveld 408576698