| Index: components/sync/syncable/model_type.cc
|
| diff --git a/components/sync/syncable/model_type.cc b/components/sync/syncable/model_type.cc
|
| index 6443ce18b9cec90eda091542f0dcf2f561009f01..428359f129b41cea304b67911b7764f2110d4a20 100644
|
| --- a/components/sync/syncable/model_type.cc
|
| +++ b/components/sync/syncable/model_type.cc
|
| @@ -557,7 +557,7 @@ bool IsControlType(ModelType model_type) {
|
| }
|
|
|
| ModelTypeSet CoreTypes() {
|
| - syncer::ModelTypeSet result;
|
| + ModelTypeSet result;
|
| result.PutAll(PriorityCoreTypes());
|
|
|
| // The following are low priority core types.
|
| @@ -570,7 +570,7 @@ ModelTypeSet CoreTypes() {
|
| }
|
|
|
| ModelTypeSet PriorityCoreTypes() {
|
| - syncer::ModelTypeSet result;
|
| + ModelTypeSet result;
|
| result.PutAll(ControlTypes());
|
|
|
| // The following are non-control core types.
|
| @@ -673,7 +673,7 @@ ModelTypeSet ModelTypeSetFromString(const std::string& model_types_string) {
|
| } else {
|
| type_str = working_copy.substr(0, end);
|
| }
|
| - syncer::ModelType type = ModelTypeFromString(type_str);
|
| + ModelType type = ModelTypeFromString(type_str);
|
| if (IsRealDataType(type))
|
| model_types.Put(type);
|
| working_copy = working_copy.substr(end + 1);
|
|
|