Index: components/sync/core_impl/model_type_connector_proxy_unittest.cc |
diff --git a/components/sync/core_impl/model_type_connector_proxy_unittest.cc b/components/sync/core_impl/model_type_connector_proxy_unittest.cc |
index d87fd8594925533c2cca71b7d04d40f0e8d51106..d541475a213359a214489f4f03471979809f25d5 100644 |
--- a/components/sync/core_impl/model_type_connector_proxy_unittest.cc |
+++ b/components/sync/core_impl/model_type_connector_proxy_unittest.cc |
@@ -24,7 +24,7 @@ |
#include "components/sync/test/engine/test_directory_setter_upper.h" |
#include "testing/gtest/include/gtest/gtest.h" |
-namespace syncer { |
+namespace syncer_v2 { |
class ModelTypeConnectorProxyTest : public ::testing::Test, |
StubModelTypeService { |
@@ -35,8 +35,8 @@ class ModelTypeConnectorProxyTest : public ::testing::Test, |
void SetUp() override { |
dir_maker_.SetUp(); |
- registry_.reset(new ModelTypeRegistry(workers_, dir_maker_.directory(), |
- &nudge_handler_)); |
+ registry_.reset(new syncer::ModelTypeRegistry( |
+ workers_, dir_maker_.directory(), &nudge_handler_)); |
connector_proxy_.reset( |
new ModelTypeConnectorProxy(sync_task_runner_, registry_->AsWeakPtr())); |
} |
@@ -53,20 +53,21 @@ class ModelTypeConnectorProxyTest : public ::testing::Test, |
void OnSyncStarting(SharedModelTypeProcessor* processor) { |
processor->OnSyncStarting( |
- base::MakeUnique<DataTypeErrorHandlerMock>(), |
+ base::MakeUnique<syncer::DataTypeErrorHandlerMock>(), |
base::Bind(&ModelTypeConnectorProxyTest::OnReadyToConnect, |
base::Unretained(this))); |
} |
- void OnReadyToConnect(SyncError error, |
+ void OnReadyToConnect(syncer::SyncError error, |
std::unique_ptr<ActivationContext> context) { |
- connector_proxy_->ConnectType(THEMES, std::move(context)); |
+ connector_proxy_->ConnectType(syncer::THEMES, std::move(context)); |
} |
std::unique_ptr<SharedModelTypeProcessor> CreateModelTypeProcessor() { |
std::unique_ptr<SharedModelTypeProcessor> processor = |
- base::WrapUnique(new SharedModelTypeProcessor(THEMES, this)); |
- processor->OnMetadataLoaded(SyncError(), base::MakeUnique<MetadataBatch>()); |
+ base::WrapUnique(new SharedModelTypeProcessor(syncer::THEMES, this)); |
+ processor->OnMetadataLoaded(syncer::SyncError(), |
+ base::MakeUnique<MetadataBatch>()); |
return processor; |
} |
@@ -75,10 +76,10 @@ class ModelTypeConnectorProxyTest : public ::testing::Test, |
scoped_refptr<base::SingleThreadTaskRunner> sync_task_runner_; |
scoped_refptr<base::SingleThreadTaskRunner> type_task_runner_; |
- std::vector<scoped_refptr<ModelSafeWorker>> workers_; |
- TestDirectorySetterUpper dir_maker_; |
- MockNudgeHandler nudge_handler_; |
- std::unique_ptr<ModelTypeRegistry> registry_; |
+ std::vector<scoped_refptr<syncer::ModelSafeWorker>> workers_; |
+ syncer::TestDirectorySetterUpper dir_maker_; |
+ syncer::MockNudgeHandler nudge_handler_; |
+ std::unique_ptr<syncer::ModelTypeRegistry> registry_; |
std::unique_ptr<ModelTypeConnectorProxy> connector_proxy_; |
}; |
@@ -133,4 +134,4 @@ TEST_F(ModelTypeConnectorProxyTest, SyncDisconnectsFirst) { |
DisableSync(); |
} |
-} // namespace syncer |
+} // namespace syncer_v2 |