summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/profile_sync_service_harness.h
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/sync/profile_sync_service_harness.h')
-rw-r--r--chrome/browser/sync/profile_sync_service_harness.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/sync/profile_sync_service_harness.h b/chrome/browser/sync/profile_sync_service_harness.h
index 4ac71c0..4317e34 100644
--- a/chrome/browser/sync/profile_sync_service_harness.h
+++ b/chrome/browser/sync/profile_sync_service_harness.h
@@ -59,7 +59,7 @@ class ProfileSyncServiceHarness
// Same as the above method, but enables sync only for the datatypes contained
// in |synced_datatypes|.
- bool SetupSync(const syncable::ModelTypeSet& synced_datatypes);
+ bool SetupSync(syncable::ModelEnumSet synced_datatypes);
// ProfileSyncServiceObserver implementation.
virtual void OnStateChanged() OVERRIDE;
@@ -102,7 +102,7 @@ class ProfileSyncServiceHarness
bool AwaitActionableError();
// Blocks until the given set of data types are migrated.
- bool AwaitMigration(const syncable::ModelTypeSet& expected_migrated_types);
+ bool AwaitMigration(syncable::ModelEnumSet expected_migrated_types);
// Blocks the caller until this harness has observed that the sync engine
// has downloaded all the changes seen by the |partner| harness's client.
@@ -335,11 +335,11 @@ class ProfileSyncServiceHarness
// The current set of data types pending migration. Used by
// AwaitMigration().
- syncable::ModelTypeSet pending_migration_types_;
+ syncable::ModelEnumSet pending_migration_types_;
// The set of data types that have undergone migration. Used by
// AwaitMigration().
- syncable::ModelTypeSet migrated_types_;
+ syncable::ModelEnumSet migrated_types_;
// Used for logging.
const std::string profile_debug_name_;