Index: components/sync/api/fake_model_type_change_processor.h |
diff --git a/components/sync/api/fake_model_type_change_processor.h b/components/sync/api/fake_model_type_change_processor.h |
index 288c7ccb1b6ceba4efe8e70a489a0b7b455d223f..4f31a6a6e0f2303fa5d1c6d95d6d3c020450ab23 100644 |
--- a/components/sync/api/fake_model_type_change_processor.h |
+++ b/components/sync/api/fake_model_type_change_processor.h |
@@ -12,7 +12,7 @@ |
#include "components/sync/api/model_type_change_processor.h" |
#include "components/sync/base/model_type.h" |
-namespace syncer { |
+namespace syncer_v2 { |
class ModelTypeService; |
@@ -20,7 +20,7 @@ class ModelTypeService; |
class FakeModelTypeChangeProcessor : public ModelTypeChangeProcessor { |
public: |
static std::unique_ptr<ModelTypeChangeProcessor> Create( |
- ModelType type, |
+ syncer::ModelType type, |
ModelTypeService* service); |
FakeModelTypeChangeProcessor(); |
@@ -32,15 +32,17 @@ class FakeModelTypeChangeProcessor : public ModelTypeChangeProcessor { |
MetadataChangeList* metadata_change_list) override; |
void Delete(const std::string& client_tag, |
MetadataChangeList* metadata_change_list) override; |
- void OnMetadataLoaded(SyncError error, |
+ void OnMetadataLoaded(syncer::SyncError error, |
std::unique_ptr<MetadataBatch> batch) override; |
- void OnSyncStarting(std::unique_ptr<DataTypeErrorHandler> error_handler, |
- const StartCallback& callback) override; |
+ void OnSyncStarting( |
+ std::unique_ptr<syncer::DataTypeErrorHandler> error_handler, |
+ const StartCallback& callback) override; |
void DisableSync() override; |
- SyncError CreateAndUploadError(const tracked_objects::Location& location, |
- const std::string& message) override; |
+ syncer::SyncError CreateAndUploadError( |
+ const tracked_objects::Location& location, |
+ const std::string& message) override; |
}; |
-} // namespace syncer |
+} // namespace syncer_v2 |
#endif // COMPONENTS_SYNC_API_FAKE_MODEL_TYPE_CHANGE_PROCESSOR_H_ |