Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(600)

Unified Diff: components/sync/api/fake_model_type_service.h

Issue 2388163002: [Sync] Move //components/sync to the syncer namespace, take 2. (Closed)
Patch Set: Rebase. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/sync/api/fake_model_type_service.h
diff --git a/components/sync/api/fake_model_type_service.h b/components/sync/api/fake_model_type_service.h
index 9153d3418e50e95dfc6014245cf62a4a0a75913d..b6da7194bfd7dd1c63c8629b6ad70a14e2ef9746 100644
--- a/components/sync/api/fake_model_type_service.h
+++ b/components/sync/api/fake_model_type_service.h
@@ -15,7 +15,7 @@
#include "components/sync/protocol/data_type_state.pb.h"
#include "components/sync/protocol/entity_metadata.pb.h"
-namespace syncer_v2 {
+namespace syncer {
// A basic, functional implementation of ModelTypeService for testing purposes.
// It uses the PREFERENCES type to provide a simple key/value interface, and
@@ -101,10 +101,10 @@ class FakeModelTypeService : public ModelTypeService {
// ModelTypeService implementation
std::unique_ptr<MetadataChangeList> CreateMetadataChangeList() override;
- syncer::SyncError MergeSyncData(
+ SyncError MergeSyncData(
std::unique_ptr<MetadataChangeList> metadata_change_list,
EntityDataMap entity_data_map) override;
- syncer::SyncError ApplySyncChanges(
+ SyncError ApplySyncChanges(
std::unique_ptr<MetadataChangeList> metadata_change_list,
EntityChangeList entity_changes) override;
void GetData(StorageKeyList storage_keys, DataCallback callback) override;
@@ -121,7 +121,7 @@ class FakeModelTypeService : public ModelTypeService {
void SetConflictResolution(ConflictResolution resolution);
// Sets the error that the next fallible call to the service will generate.
- void SetServiceError(syncer::SyncError::ErrorType error_type);
+ void SetServiceError(SyncError::ErrorType error_type);
const Store& db() const { return db_; }
@@ -140,9 +140,9 @@ class FakeModelTypeService : public ModelTypeService {
std::unique_ptr<ConflictResolution> conflict_resolution_;
// The error to produce on the next service call.
- syncer::SyncError service_error_;
+ SyncError service_error_;
};
-} // namespace syncer_v2
+} // namespace syncer
#endif // COMPONENTS_SYNC_API_FAKE_MODEL_TYPE_SERVICE_H_
« no previous file with comments | « components/sync/api/fake_model_type_change_processor.cc ('k') | components/sync/api/fake_model_type_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698