Sync: move v2 classes in chrome/internal_api to syncer_v2 namespace.

This changes namespace of some of internal API Bismarck classes from
syncer to syncer_v2 to make it easier to distinguish the new code from the
current Sync implementation. The change includes a bit of dependency
cleanup. This is a fairly trivial change, but a good way to see most of
Bismarck classes and how they are integrated in the rest of the code.
There are two more separate issues to make a similar namespace change
in sync/engine and components/sync_driver directories.
sync/engine

BUG=516414

Review URL: https://codereview.chromium.org/1266113004

Cr-Commit-Position: refs/heads/master@{#341862}

3 files changed, 50 insertions, 50 deletions

diff --git a/sync/sessions/model_type_registry.cc b/sync/sessions/model_type_registry.cc
index 0bd70b2..2f72a2f 100644
--- a/sync/sessions/model_type_registry.cc
+++ b/sync/sessions/model_type_registry.cc
@@ -28,11 +28,13 @@ class ModelTypeSyncProxyWrapper : public ModelTypeSyncProxy {
       const scoped_refptr<base::SequencedTaskRunner>& processor_task_runner);
   ~ModelTypeSyncProxyWrapper() override;
 
-  void OnCommitCompleted(const DataTypeState& type_state,
-                         const CommitResponseDataList& response_list) override;
-  void OnUpdateReceived(const DataTypeState& type_state,
-                        const UpdateResponseDataList& response_list,
-                        const UpdateResponseDataList& pending_updates) override;
+  void OnCommitCompleted(
+      const syncer_v2::DataTypeState& type_state,
+      const syncer_v2::CommitResponseDataList& response_list) override;
+  void OnUpdateReceived(
+      const syncer_v2::DataTypeState& type_state,
+      const syncer_v2::UpdateResponseDataList& response_list,
+      const syncer_v2::UpdateResponseDataList& pending_updates) override;
 
  private:
   base::WeakPtr<ModelTypeSyncProxyImpl> processor_;
@@ -49,8 +51,8 @@ ModelTypeSyncProxyWrapper::~ModelTypeSyncProxyWrapper() {
 }
 
 void ModelTypeSyncProxyWrapper::OnCommitCompleted(
-    const DataTypeState& type_state,
-    const CommitResponseDataList& response_list) {
+    const syncer_v2::DataTypeState& type_state,
+    const syncer_v2::CommitResponseDataList& response_list) {
   processor_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&ModelTypeSyncProxyImpl::OnCommitCompleted,
@@ -60,9 +62,9 @@ void ModelTypeSyncProxyWrapper::OnCommitCompleted(
 }
 
 void ModelTypeSyncProxyWrapper::OnUpdateReceived(
-    const DataTypeState& type_state,
-    const UpdateResponseDataList& response_list,
-    const UpdateResponseDataList& pending_updates) {
+    const syncer_v2::DataTypeState& type_state,
+    const syncer_v2::UpdateResponseDataList& response_list,
+    const syncer_v2::UpdateResponseDataList& pending_updates) {
   processor_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&ModelTypeSyncProxyImpl::OnUpdateReceived,
@@ -79,7 +81,7 @@ class ModelTypeSyncWorkerWrapper : public ModelTypeSyncWorker {
       const scoped_refptr<base::SequencedTaskRunner>& sync_thread);
   ~ModelTypeSyncWorkerWrapper() override;
 
-  void EnqueueForCommit(const CommitRequestDataList& list) override;
+  void EnqueueForCommit(const syncer_v2::CommitRequestDataList& list) override;
 
  private:
   base::WeakPtr<ModelTypeSyncWorkerImpl> worker_;
@@ -96,7 +98,7 @@ ModelTypeSyncWorkerWrapper::~ModelTypeSyncWorkerWrapper() {
 }
 
 void ModelTypeSyncWorkerWrapper::EnqueueForCommit(
-    const CommitRequestDataList& list) {
+    const syncer_v2::CommitRequestDataList& list) {
   sync_thread_->PostTask(
       FROM_HERE,
       base::Bind(&ModelTypeSyncWorkerImpl::EnqueueForCommit, worker_, list));
@@ -187,8 +189,8 @@ void ModelTypeRegistry::SetEnabledDirectoryTypes(
 
 void ModelTypeRegistry::ConnectSyncTypeToWorker(
     ModelType type,
-    const DataTypeState& data_type_state,
-    const UpdateResponseDataList& saved_pending_updates,
+    const syncer_v2::DataTypeState& data_type_state,
+    const syncer_v2::UpdateResponseDataList& saved_pending_updates,
     const scoped_refptr<base::SequencedTaskRunner>& type_task_runner,
     const base::WeakPtr<ModelTypeSyncProxyImpl>& proxy_impl) {
   DVLOG(1) << "Enabling an off-thread sync type: " << ModelTypeToString(type);
@@ -297,7 +299,7 @@ void ModelTypeRegistry::RequestEmitDebugInfo() {
   }
 }
 
-base::WeakPtr<SyncContext> ModelTypeRegistry::AsWeakPtr() {
+base::WeakPtr<syncer_v2::SyncContext> ModelTypeRegistry::AsWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
diff --git a/sync/sessions/model_type_registry.h b/sync/sessions/model_type_registry.h
index 53c0d99..ca3ee80 100644
--- a/sync/sessions/model_type_registry.h
+++ b/sync/sessions/model_type_registry.h
@@ -20,6 +20,10 @@
 #include "sync/internal_api/public/sync_context.h"
 #include "sync/internal_api/public/sync_encryption_handler.h"
 
+namespace syncer_v2 {
+struct DataTypeState;
+}
+
 namespace syncer {
 
 namespace syncable {
@@ -41,7 +45,7 @@ typedef std::map<ModelType, DirectoryTypeDebugInfoEmitter*>
 
 // Keeps track of the sets of active update handlers and commit contributors.
 class SYNC_EXPORT_PRIVATE ModelTypeRegistry
-    : public SyncContext,
+    : public syncer_v2::SyncContext,
       public SyncEncryptionHandler::Observer {
  public:
   // Constructs a ModelTypeRegistry that supports directory types.
@@ -59,8 +63,8 @@ class SYNC_EXPORT_PRIVATE ModelTypeRegistry
   // Expects that the proxy's ModelType is not currently enabled.
   void ConnectSyncTypeToWorker(
       syncer::ModelType type,
-      const DataTypeState& data_type_state,
-      const syncer::UpdateResponseDataList& saved_pending_updates,
+      const syncer_v2::DataTypeState& data_type_state,
+      const syncer_v2::UpdateResponseDataList& saved_pending_updates,
       const scoped_refptr<base::SequencedTaskRunner>& type_task_runner,
       const base::WeakPtr<ModelTypeSyncProxyImpl>& proxy) override;
 
diff --git a/sync/sessions/model_type_registry_unittest.cc b/sync/sessions/model_type_registry_unittest.cc
index 47be479..4390181 100644
--- a/sync/sessions/model_type_registry_unittest.cc
+++ b/sync/sessions/model_type_registry_unittest.cc
@@ -25,8 +25,8 @@ class ModelTypeRegistryTest : public ::testing::Test {
 
   ModelTypeRegistry* registry();
 
-  static DataTypeState MakeInitialDataTypeState(ModelType type) {
-    DataTypeState state;
+  static syncer_v2::DataTypeState MakeInitialDataTypeState(ModelType type) {
+    syncer_v2::DataTypeState state;
     state.progress_marker.set_data_type_id(
         GetSpecificsFieldNumberFromModelType(type));
     state.next_client_id = 0;
@@ -152,19 +152,17 @@ TEST_F(ModelTypeRegistryTest, NonBlockingTypes) {
 
   EXPECT_TRUE(registry()->GetEnabledTypes().Empty());
 
-  registry()->ConnectSyncTypeToWorker(syncer::THEMES,
-                                      MakeInitialDataTypeState(THEMES),
-                                      UpdateResponseDataList(),
-                                      task_runner,
-                                      themes_sync_proxy.AsWeakPtrForUI());
+  registry()->ConnectSyncTypeToWorker(
+      syncer::THEMES, MakeInitialDataTypeState(THEMES),
+      syncer_v2::UpdateResponseDataList(), task_runner,
+      themes_sync_proxy.AsWeakPtrForUI());
   EXPECT_TRUE(registry()->GetEnabledTypes().Equals(
       ModelTypeSet(syncer::THEMES)));
 
-  registry()->ConnectSyncTypeToWorker(syncer::SESSIONS,
-                                      MakeInitialDataTypeState(SESSIONS),
-                                      UpdateResponseDataList(),
-                                      task_runner,
-                                      sessions_sync_proxy.AsWeakPtrForUI());
+  registry()->ConnectSyncTypeToWorker(
+      syncer::SESSIONS, MakeInitialDataTypeState(SESSIONS),
+      syncer_v2::UpdateResponseDataList(), task_runner,
+      sessions_sync_proxy.AsWeakPtrForUI());
   EXPECT_TRUE(registry()->GetEnabledTypes().Equals(
       ModelTypeSet(syncer::THEMES, syncer::SESSIONS)));
 
@@ -192,11 +190,10 @@ TEST_F(ModelTypeRegistryTest, NonBlockingTypesWithDirectoryTypes) {
   EXPECT_TRUE(registry()->GetEnabledTypes().Empty());
 
   // Add the themes non-blocking type.
-  registry()->ConnectSyncTypeToWorker(syncer::THEMES,
-                                      MakeInitialDataTypeState(THEMES),
-                                      UpdateResponseDataList(),
-                                      task_runner,
-                                      themes_sync_proxy.AsWeakPtrForUI());
+  registry()->ConnectSyncTypeToWorker(
+      syncer::THEMES, MakeInitialDataTypeState(THEMES),
+      syncer_v2::UpdateResponseDataList(), task_runner,
+      themes_sync_proxy.AsWeakPtrForUI());
   current_types.Put(syncer::THEMES);
   EXPECT_TRUE(registry()->GetEnabledTypes().Equals(current_types));
 
@@ -206,11 +203,10 @@ TEST_F(ModelTypeRegistryTest, NonBlockingTypesWithDirectoryTypes) {
   EXPECT_TRUE(registry()->GetEnabledTypes().Equals(current_types));
 
   // Add sessions non-blocking type.
-  registry()->ConnectSyncTypeToWorker(syncer::SESSIONS,
-                                      MakeInitialDataTypeState(SESSIONS),
-                                      UpdateResponseDataList(),
-                                      task_runner,
-                                      sessions_sync_proxy.AsWeakPtrForUI());
+  registry()->ConnectSyncTypeToWorker(
+      syncer::SESSIONS, MakeInitialDataTypeState(SESSIONS),
+      syncer_v2::UpdateResponseDataList(), task_runner,
+      sessions_sync_proxy.AsWeakPtrForUI());
   current_types.Put(syncer::SESSIONS);
   EXPECT_TRUE(registry()->GetEnabledTypes().Equals(current_types));
 
@@ -237,16 +233,14 @@ TEST_F(ModelTypeRegistryTest, DeletionOrdering) {
 
   EXPECT_TRUE(registry()->GetEnabledTypes().Empty());
 
-  registry()->ConnectSyncTypeToWorker(syncer::THEMES,
-                                      MakeInitialDataTypeState(THEMES),
-                                      UpdateResponseDataList(),
-                                      task_runner,
-                                      themes_sync_proxy->AsWeakPtrForUI());
-  registry()->ConnectSyncTypeToWorker(syncer::SESSIONS,
-                                      MakeInitialDataTypeState(SESSIONS),
-                                      UpdateResponseDataList(),
-                                      task_runner,
-                                      sessions_sync_proxy->AsWeakPtrForUI());
+  registry()->ConnectSyncTypeToWorker(
+      syncer::THEMES, MakeInitialDataTypeState(THEMES),
+      syncer_v2::UpdateResponseDataList(), task_runner,
+      themes_sync_proxy->AsWeakPtrForUI());
+  registry()->ConnectSyncTypeToWorker(
+      syncer::SESSIONS, MakeInitialDataTypeState(SESSIONS),
+      syncer_v2::UpdateResponseDataList(), task_runner,
+      sessions_sync_proxy->AsWeakPtrForUI());
   EXPECT_TRUE(registry()->GetEnabledTypes().Equals(
       ModelTypeSet(syncer::THEMES, syncer::SESSIONS)));