| Index: chrome/browser/sync/test/integration/sync_test.cc
|
| diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc
|
| index 9c83bfd8a17a49063ab43f8294d8661774d08157..911bcbeb77ec3c7639a2df0eb495f5f79c342c30 100644
|
| --- a/chrome/browser/sync/test/integration/sync_test.cc
|
| +++ b/chrome/browser/sync/test/integration/sync_test.cc
|
| @@ -567,7 +567,7 @@ void SyncTest::EnableNotifications() {
|
| }
|
|
|
| void SyncTest::TriggerNotification(
|
| - syncable::ModelEnumSet changed_types) {
|
| + syncable::ModelTypeSet changed_types) {
|
| ASSERT_TRUE(ServerSupportsNotificationControl());
|
| const std::string& data =
|
| sync_notifier::P2PNotificationData("from_server",
|
| @@ -589,11 +589,11 @@ bool SyncTest::ServerSupportsErrorTriggering() const {
|
| }
|
|
|
| void SyncTest::TriggerMigrationDoneError(
|
| - syncable::ModelEnumSet model_types) {
|
| + syncable::ModelTypeSet model_types) {
|
| ASSERT_TRUE(ServerSupportsErrorTriggering());
|
| std::string path = "chromiumsync/migrate";
|
| char joiner = '?';
|
| - for (syncable::ModelEnumSet::Iterator it = model_types.First();
|
| + for (syncable::ModelTypeSet::Iterator it = model_types.First();
|
| it.Good(); it.Inc()) {
|
| path.append(
|
| base::StringPrintf(
|
|
|