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

Unified Diff: components/sync/core_impl/model_type_connector_proxy_unittest.cc

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/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 d541475a213359a214489f4f03471979809f25d5..d87fd8594925533c2cca71b7d04d40f0e8d51106 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_v2 {
+namespace syncer {
class ModelTypeConnectorProxyTest : public ::testing::Test,
StubModelTypeService {
@@ -35,8 +35,8 @@ class ModelTypeConnectorProxyTest : public ::testing::Test,
void SetUp() override {
dir_maker_.SetUp();
- registry_.reset(new syncer::ModelTypeRegistry(
- workers_, dir_maker_.directory(), &nudge_handler_));
+ registry_.reset(new ModelTypeRegistry(workers_, dir_maker_.directory(),
+ &nudge_handler_));
connector_proxy_.reset(
new ModelTypeConnectorProxy(sync_task_runner_, registry_->AsWeakPtr()));
}
@@ -53,21 +53,20 @@ class ModelTypeConnectorProxyTest : public ::testing::Test,
void OnSyncStarting(SharedModelTypeProcessor* processor) {
processor->OnSyncStarting(
- base::MakeUnique<syncer::DataTypeErrorHandlerMock>(),
+ base::MakeUnique<DataTypeErrorHandlerMock>(),
base::Bind(&ModelTypeConnectorProxyTest::OnReadyToConnect,
base::Unretained(this)));
}
- void OnReadyToConnect(syncer::SyncError error,
+ void OnReadyToConnect(SyncError error,
std::unique_ptr<ActivationContext> context) {
- connector_proxy_->ConnectType(syncer::THEMES, std::move(context));
+ connector_proxy_->ConnectType(THEMES, std::move(context));
}
std::unique_ptr<SharedModelTypeProcessor> CreateModelTypeProcessor() {
std::unique_ptr<SharedModelTypeProcessor> processor =
- base::WrapUnique(new SharedModelTypeProcessor(syncer::THEMES, this));
- processor->OnMetadataLoaded(syncer::SyncError(),
- base::MakeUnique<MetadataBatch>());
+ base::WrapUnique(new SharedModelTypeProcessor(THEMES, this));
+ processor->OnMetadataLoaded(SyncError(), base::MakeUnique<MetadataBatch>());
return processor;
}
@@ -76,10 +75,10 @@ class ModelTypeConnectorProxyTest : public ::testing::Test,
scoped_refptr<base::SingleThreadTaskRunner> sync_task_runner_;
scoped_refptr<base::SingleThreadTaskRunner> type_task_runner_;
- std::vector<scoped_refptr<syncer::ModelSafeWorker>> workers_;
- syncer::TestDirectorySetterUpper dir_maker_;
- syncer::MockNudgeHandler nudge_handler_;
- std::unique_ptr<syncer::ModelTypeRegistry> registry_;
+ std::vector<scoped_refptr<ModelSafeWorker>> workers_;
+ TestDirectorySetterUpper dir_maker_;
+ MockNudgeHandler nudge_handler_;
+ std::unique_ptr<ModelTypeRegistry> registry_;
std::unique_ptr<ModelTypeConnectorProxy> connector_proxy_;
};
@@ -134,4 +133,4 @@ TEST_F(ModelTypeConnectorProxyTest, SyncDisconnectsFirst) {
DisableSync();
}
-} // namespace syncer_v2
+} // namespace syncer

Powered by Google App Engine
This is Rietveld 408576698