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

Unified Diff: components/sync/api/model_type_service_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
« no previous file with comments | « components/sync/api/model_type_service.cc ('k') | components/sync/api/model_type_store.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/api/model_type_service_unittest.cc
diff --git a/components/sync/api/model_type_service_unittest.cc b/components/sync/api/model_type_service_unittest.cc
index 7906244515dd8ad443eb49c6cc9295fd606ff8d6..0ac512219a5368857bae66741ea8e0d688cd88ee 100644
--- a/components/sync/api/model_type_service_unittest.cc
+++ b/components/sync/api/model_type_service_unittest.cc
@@ -11,7 +11,7 @@
#include "components/sync/api/stub_model_type_service.h"
#include "testing/gtest/include/gtest/gtest.h"
-namespace syncer_v2 {
+namespace syncer {
// A mock MTCP that lets us know when DisableSync is called.
class MockModelTypeChangeProcessor : public FakeModelTypeChangeProcessor {
@@ -48,7 +48,7 @@ class MockModelTypeService : public StubModelTypeService {
private:
std::unique_ptr<ModelTypeChangeProcessor> CreateProcessor(
- syncer::ModelType type,
+ ModelType type,
ModelTypeService* service) {
return base::MakeUnique<MockModelTypeChangeProcessor>(base::Bind(
&MockModelTypeService::OnProcessorDisableSync, base::Unretained(this)));
@@ -69,7 +69,7 @@ class ModelTypeServiceTest : public ::testing::Test {
void OnSyncStarting() {
service_.OnSyncStarting(
- base::MakeUnique<syncer::DataTypeErrorHandlerMock>(),
+ base::MakeUnique<DataTypeErrorHandlerMock>(),
base::Bind(&ModelTypeServiceTest::OnProcessorStarted,
base::Unretained(this)));
}
@@ -79,7 +79,7 @@ class ModelTypeServiceTest : public ::testing::Test {
private:
void OnProcessorStarted(
- syncer::SyncError error,
+ SyncError error,
std::unique_ptr<ActivationContext> activation_context) {
start_callback_called_ = true;
}
@@ -152,4 +152,4 @@ TEST_F(ModelTypeServiceTest, DefaultConflictResolution) {
service()->ResolveConflict(local_data, remote_data).type());
}
-} // namespace syncer_v2
+} // namespace syncer
« no previous file with comments | « components/sync/api/model_type_service.cc ('k') | components/sync/api/model_type_store.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698