[Sync] Move //components/sync to the syncer namespace, take 2.

components/sync/api/model_type_service.cc

Index: components/sync/api/model_type_service.cc
diff --git a/components/sync/api/model_type_service.cc b/components/sync/api/model_type_service.cc
index 90804c3b3e3a55f5ad55a3679f54584926c433d2..86e7d0c30c8df486ba78b95d4342a2d7c7e1dd89 100644
--- a/components/sync/api/model_type_service.cc
+++ b/components/sync/api/model_type_service.cc
@@ -6,11 +6,11 @@
 
 #include <utility>
 
-namespace syncer_v2 {
+namespace syncer {
 
 ModelTypeService::ModelTypeService(
     const ChangeProcessorFactory& change_processor_factory,
-    syncer::ModelType type)
+    ModelType type)
     : change_processor_factory_(change_processor_factory), type_(type) {}
 
 ModelTypeService::~ModelTypeService() {}
@@ -27,7 +27,7 @@ ConflictResolution ModelTypeService::ResolveConflict(
 }
 
 void ModelTypeService::OnSyncStarting(
-    std::unique_ptr<syncer::DataTypeErrorHandler> error_handler,
+    std::unique_ptr<DataTypeErrorHandler> error_handler,
     const ModelTypeChangeProcessor::StartCallback& start_callback) {
   CreateChangeProcessor();
   change_processor_->OnSyncStarting(std::move(error_handler), start_callback);
@@ -55,4 +55,4 @@ void ModelTypeService::clear_change_processor() {
   change_processor_.reset();
 }
 
-}  // namespace syncer_v2
+}  // namespace syncer