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

components/sync/engine_impl/non_blocking_type_commit_contribution.cc

Index: components/sync/engine_impl/non_blocking_type_commit_contribution.cc
diff --git a/components/sync/engine_impl/non_blocking_type_commit_contribution.cc b/components/sync/engine_impl/non_blocking_type_commit_contribution.cc
index a7b718e3956c471011647241c6ba53540001559d..9f71b66cb42f4d7255bd0b4f0f17571a340bc7be 100644
--- a/components/sync/engine_impl/non_blocking_type_commit_contribution.cc
+++ b/components/sync/engine_impl/non_blocking_type_commit_contribution.cc
@@ -14,7 +14,7 @@
 #include "components/sync/engine_impl/model_type_worker.h"
 #include "components/sync/protocol/proto_value_conversions.h"
 
-namespace syncer_v2 {
+namespace syncer {
 
 NonBlockingTypeCommitContribution::NonBlockingTypeCommitContribution(
     const sync_pb::DataTypeContext& context,
@@ -40,9 +40,9 @@ void NonBlockingTypeCommitContribution::AddToCommitMessage(
     commit_message->add_client_contexts()->CopyFrom(context_);
 }
 
-syncer::SyncerError NonBlockingTypeCommitContribution::ProcessCommitResponse(
+SyncerError NonBlockingTypeCommitContribution::ProcessCommitResponse(
     const sync_pb::ClientToServerResponse& response,
-    syncer::StatusController* status) {
+    StatusController* status) {
   const sync_pb::CommitResponse& commit_response = response.commit();
 
   bool transient_error = false;
@@ -59,13 +59,13 @@ syncer::SyncerError NonBlockingTypeCommitContribution::ProcessCommitResponse(
       case sync_pb::CommitResponse::INVALID_MESSAGE:
         LOG(ERROR) << "Server reports commit message is invalid.";
         DLOG(ERROR) << "Message was: "
-                    << syncer::SyncEntityToValue(entities_.Get(i), false).get();
+                    << SyncEntityToValue(entities_.Get(i), false).get();
         unknown_error = true;
         break;
       case sync_pb::CommitResponse::CONFLICT:
         DVLOG(1) << "Server reports conflict for commit message.";
         DVLOG(1) << "Message was: "
-                 << syncer::SyncEntityToValue(entities_.Get(i), false).get();
+                 << SyncEntityToValue(entities_.Get(i), false).get();
         commit_conflict = true;
         break;
       case sync_pb::CommitResponse::SUCCESS: {
@@ -95,13 +95,13 @@ syncer::SyncerError NonBlockingTypeCommitContribution::ProcessCommitResponse(
 
   // Let the scheduler know about the failures.
   if (unknown_error) {
-    return syncer::SERVER_RETURN_UNKNOWN_ERROR;
+    return SERVER_RETURN_UNKNOWN_ERROR;
   } else if (transient_error) {
-    return syncer::SERVER_RETURN_TRANSIENT_ERROR;
+    return SERVER_RETURN_TRANSIENT_ERROR;
   } else if (commit_conflict) {
-    return syncer::SERVER_RETURN_CONFLICT;
+    return SERVER_RETURN_CONFLICT;
   } else {
-    return syncer::SYNCER_OK;
+    return SYNCER_OK;
   }
 }
 
@@ -117,4 +117,4 @@ size_t NonBlockingTypeCommitContribution::GetNumEntries() const {
   return entities_.size();
 }
 
-}  // namespace syncer_v2
+}  // namespace syncer