Revert of [Sync] Move //components/sync to the syncer namespace. (patchset #5 id:40001 of https://co

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 f8e8cfb01142ba0e995b0d7daed5b32ad6345a0a..24545e978bf539d0524d24bdddd441ae1f501f94 100644
--- a/components/sync/engine_impl/non_blocking_type_commit_contribution.cc
+++ b/components/sync/engine_impl/non_blocking_type_commit_contribution.cc
@@ -11,7 +11,7 @@
 #include "components/sync/engine_impl/model_type_worker.h"
 #include "components/sync/protocol/proto_value_conversions.h"
 
-namespace syncer {
+namespace syncer_v2 {
 
 NonBlockingTypeCommitContribution::NonBlockingTypeCommitContribution(
     const sync_pb::DataTypeContext& context,
@@ -37,9 +37,9 @@ void NonBlockingTypeCommitContribution::AddToCommitMessage(
     commit_message->add_client_contexts()->CopyFrom(context_);
 }
 
-SyncerError NonBlockingTypeCommitContribution::ProcessCommitResponse(
+syncer::SyncerError NonBlockingTypeCommitContribution::ProcessCommitResponse(
     const sync_pb::ClientToServerResponse& response,
-    StatusController* status) {
+    syncer::StatusController* status) {
   const sync_pb::CommitResponse& commit_response = response.commit();
 
   bool transient_error = false;
@@ -56,13 +56,13 @@ SyncerError NonBlockingTypeCommitContribution::ProcessCommitResponse(
       case sync_pb::CommitResponse::INVALID_MESSAGE:
         LOG(ERROR) << "Server reports commit message is invalid.";
         DLOG(ERROR) << "Message was: "
-                    << SyncEntityToValue(entities_.Get(i), false).get();
+                    << syncer::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: "
-                 << SyncEntityToValue(entities_.Get(i), false).get();
+                 << syncer::SyncEntityToValue(entities_.Get(i), false).get();
         commit_conflict = true;
         break;
       case sync_pb::CommitResponse::SUCCESS: {
@@ -92,13 +92,13 @@ SyncerError NonBlockingTypeCommitContribution::ProcessCommitResponse(
 
   // Let the scheduler know about the failures.
   if (unknown_error) {
-    return SERVER_RETURN_UNKNOWN_ERROR;
+    return syncer::SERVER_RETURN_UNKNOWN_ERROR;
   } else if (transient_error) {
-    return SERVER_RETURN_TRANSIENT_ERROR;
+    return syncer::SERVER_RETURN_TRANSIENT_ERROR;
   } else if (commit_conflict) {
-    return SERVER_RETURN_CONFLICT;
+    return syncer::SERVER_RETURN_CONFLICT;
   } else {
-    return SYNCER_OK;
+    return syncer::SYNCER_OK;
   }
 }
 
@@ -114,4 +114,4 @@ size_t NonBlockingTypeCommitContribution::GetNumEntries() const {
   return entities_.size();
 }
 
-}  // namespace syncer
+}  // namespace syncer_v2