| Index: chrome/browser/sync/glue/data_type_manager_impl_unittest.cc
|
| diff --git a/chrome/browser/sync/glue/data_type_manager_impl_unittest.cc b/chrome/browser/sync/glue/data_type_manager_impl_unittest.cc
|
| index 874b9ad0d03669eabb50d673a874324ce52198bc..5769c282df0306a53672493dbd4c8922cc6006a4 100644
|
| --- a/chrome/browser/sync/glue/data_type_manager_impl_unittest.cc
|
| +++ b/chrome/browser/sync/glue/data_type_manager_impl_unittest.cc
|
| @@ -22,13 +22,13 @@
|
|
|
| namespace browser_sync {
|
|
|
| -using syncable::ModelType;
|
| -using syncable::ModelTypeSet;
|
| -using syncable::ModelTypeToString;
|
| -using syncable::BOOKMARKS;
|
| -using syncable::APPS;
|
| -using syncable::PASSWORDS;
|
| -using syncable::PREFERENCES;
|
| +using syncer::ModelType;
|
| +using syncer::ModelTypeSet;
|
| +using syncer::ModelTypeToString;
|
| +using syncer::BOOKMARKS;
|
| +using syncer::APPS;
|
| +using syncer::PASSWORDS;
|
| +using syncer::PREFERENCES;
|
| using testing::_;
|
| using testing::Mock;
|
| using testing::ResultOf;
|
| @@ -215,7 +215,7 @@ TEST_P(SyncDataTypeManagerImplTest, ConfigureSlowLoadingType) {
|
| SetConfigureStartExpectation();
|
| SetConfigureDoneExpectation(DataTypeManager::PARTIAL_SUCCESS);
|
|
|
| - syncable::ModelTypeSet types;
|
| + syncer::ModelTypeSet types;
|
| types.Put(BOOKMARKS);
|
| types.Put(APPS);
|
|
|
|
|