| Index: components/sync/api/fake_model_type_service.cc
|
| diff --git a/components/sync/api/fake_model_type_service.cc b/components/sync/api/fake_model_type_service.cc
|
| index 9c9b2e89373048965fdef30b813f5948d20ddbfd..c2328093510de355fac75375e374a447884370c4 100644
|
| --- a/components/sync/api/fake_model_type_service.cc
|
| +++ b/components/sync/api/fake_model_type_service.cc
|
| @@ -17,7 +17,7 @@ using sync_pb::EntitySpecifics;
|
| using sync_pb::EntityMetadata;
|
| using sync_pb::DataTypeState;
|
|
|
| -namespace syncer_v2 {
|
| +namespace syncer {
|
|
|
| namespace {
|
|
|
| @@ -44,8 +44,8 @@ std::string FakeModelTypeService::ClientTagFromKey(const std::string& key) {
|
|
|
| // static
|
| std::string FakeModelTypeService::TagHashFromKey(const std::string& key) {
|
| - return syncer::syncable::GenerateSyncableHash(
|
| - syncer::PREFERENCES, FakeModelTypeService::ClientTagFromKey(key));
|
| + return syncable::GenerateSyncableHash(
|
| + PREFERENCES, FakeModelTypeService::ClientTagFromKey(key));
|
| }
|
|
|
| // static
|
| @@ -137,7 +137,7 @@ void FakeModelTypeService::Store::Reset() {
|
|
|
| FakeModelTypeService::FakeModelTypeService(
|
| const ChangeProcessorFactory& change_processor_factory)
|
| - : ModelTypeService(change_processor_factory, syncer::PREFERENCES) {}
|
| + : ModelTypeService(change_processor_factory, PREFERENCES) {}
|
|
|
| FakeModelTypeService::~FakeModelTypeService() {
|
| CheckPostConditions();
|
| @@ -178,12 +178,12 @@ FakeModelTypeService::CreateMetadataChangeList() {
|
| return std::unique_ptr<MetadataChangeList>(new SimpleMetadataChangeList());
|
| }
|
|
|
| -syncer::SyncError FakeModelTypeService::MergeSyncData(
|
| +SyncError FakeModelTypeService::MergeSyncData(
|
| std::unique_ptr<MetadataChangeList> metadata_changes,
|
| EntityDataMap data_map) {
|
| if (service_error_.IsSet()) {
|
| - syncer::SyncError error = service_error_;
|
| - service_error_ = syncer::SyncError();
|
| + SyncError error = service_error_;
|
| + service_error_ = SyncError();
|
| return error;
|
| }
|
| // Commit any local entities that aren't being overwritten by the server.
|
| @@ -198,15 +198,15 @@ syncer::SyncError FakeModelTypeService::MergeSyncData(
|
| db_.PutData(kv.first, kv.second.value());
|
| }
|
| ApplyMetadataChangeList(std::move(metadata_changes));
|
| - return syncer::SyncError();
|
| + return SyncError();
|
| }
|
|
|
| -syncer::SyncError FakeModelTypeService::ApplySyncChanges(
|
| +SyncError FakeModelTypeService::ApplySyncChanges(
|
| std::unique_ptr<MetadataChangeList> metadata_changes,
|
| EntityChangeList entity_changes) {
|
| if (service_error_.IsSet()) {
|
| - syncer::SyncError error = service_error_;
|
| - service_error_ = syncer::SyncError();
|
| + SyncError error = service_error_;
|
| + service_error_ = SyncError();
|
| return error;
|
| }
|
| for (const EntityChange& change : entity_changes) {
|
| @@ -226,7 +226,7 @@ syncer::SyncError FakeModelTypeService::ApplySyncChanges(
|
| }
|
| }
|
| ApplyMetadataChangeList(std::move(metadata_changes));
|
| - return syncer::SyncError();
|
| + return SyncError();
|
| }
|
|
|
| void FakeModelTypeService::ApplyMetadataChangeList(
|
| @@ -263,7 +263,7 @@ void FakeModelTypeService::ApplyMetadataChangeList(
|
| void FakeModelTypeService::GetData(StorageKeyList keys, DataCallback callback) {
|
| if (service_error_.IsSet()) {
|
| callback.Run(service_error_, nullptr);
|
| - service_error_ = syncer::SyncError();
|
| + service_error_ = SyncError();
|
| return;
|
| }
|
| std::unique_ptr<DataBatchImpl> batch(new DataBatchImpl());
|
| @@ -271,20 +271,20 @@ void FakeModelTypeService::GetData(StorageKeyList keys, DataCallback callback) {
|
| DCHECK(db_.HasData(key)) << "No data for " << key;
|
| batch->Put(key, CopyEntityData(db_.GetData(key)));
|
| }
|
| - callback.Run(syncer::SyncError(), std::move(batch));
|
| + callback.Run(SyncError(), std::move(batch));
|
| }
|
|
|
| void FakeModelTypeService::GetAllData(DataCallback callback) {
|
| if (service_error_.IsSet()) {
|
| callback.Run(service_error_, nullptr);
|
| - service_error_ = syncer::SyncError();
|
| + service_error_ = SyncError();
|
| return;
|
| }
|
| std::unique_ptr<DataBatchImpl> batch(new DataBatchImpl());
|
| for (const auto& kv : db_.all_data()) {
|
| batch->Put(kv.first, CopyEntityData(*kv.second));
|
| }
|
| - callback.Run(syncer::SyncError(), std::move(batch));
|
| + callback.Run(SyncError(), std::move(batch));
|
| }
|
|
|
| std::string FakeModelTypeService::GetClientTag(const EntityData& entity_data) {
|
| @@ -297,11 +297,9 @@ std::string FakeModelTypeService::GetStorageKey(const EntityData& entity_data) {
|
|
|
| void FakeModelTypeService::OnChangeProcessorSet() {}
|
|
|
| -void FakeModelTypeService::SetServiceError(
|
| - syncer::SyncError::ErrorType error_type) {
|
| +void FakeModelTypeService::SetServiceError(SyncError::ErrorType error_type) {
|
| DCHECK(!service_error_.IsSet());
|
| - service_error_ = syncer::SyncError(FROM_HERE, error_type, "TestError",
|
| - syncer::PREFERENCES);
|
| + service_error_ = SyncError(FROM_HERE, error_type, "TestError", PREFERENCES);
|
| }
|
|
|
| ConflictResolution FakeModelTypeService::ResolveConflict(
|
| @@ -320,4 +318,4 @@ void FakeModelTypeService::CheckPostConditions() {
|
| DCHECK(!service_error_.IsSet());
|
| }
|
|
|
| -} // namespace syncer_v2
|
| +} // namespace syncer
|
|
|