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

components/sync/core/non_blocking_sync_common.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_SYNC_CORE_NON_BLOCKING_SYNC_COMMON_H_
 #define COMPONENTS_SYNC_CORE_NON_BLOCKING_SYNC_COMMON_H_
 
 #include <stdint.h>
 
 #include <string>
 #include <vector>
 
 #include "base/time/time.h"
 #include "components/sync/api/entity_data.h"
 #include "components/sync/protocol/sync.pb.h"
 
-namespace syncer_v2 {
+namespace syncer {
 
 static const int64_t kUncommittedVersion = -1;
 
 struct CommitRequestData {
   CommitRequestData();
   CommitRequestData(const CommitRequestData& other);
   ~CommitRequestData();
 
   EntityDataPtr entity;
 
@@ skipping 25 matching lines @@
   EntityDataPtr entity;
 
   int64_t response_version = 0;
   std::string encryption_key_name;
 };
 
 typedef std::vector<CommitRequestData> CommitRequestDataList;
 typedef std::vector<CommitResponseData> CommitResponseDataList;
 typedef std::vector<UpdateResponseData> UpdateResponseDataList;
 
-}  // namespace syncer_v2
+}  // namespace syncer
 
 #endif  // COMPONENTS_SYNC_CORE_NON_BLOCKING_SYNC_COMMON_H_