move V2 classes in chrome/engine to syncer_v2 namespace

sync/engine/model_type_sync_worker_impl_unittest.cc

Index: sync/engine/model_type_sync_worker_impl_unittest.cc
diff --git a/sync/engine/model_type_sync_worker_impl_unittest.cc b/sync/engine/model_type_sync_worker_impl_unittest.cc
index 29e348845abae071cf4f375898233718c501b2cb..0e58a98cdfafabbe6a160caa006764605bd4aae0 100644
--- a/sync/engine/model_type_sync_worker_impl_unittest.cc
+++ b/sync/engine/model_type_sync_worker_impl_unittest.cc
@@ -24,7 +24,13 @@ static const syncer::ModelType kModelType = syncer::PREFERENCES;
 // Special constant value taken from cryptographer.cc.
 const char kNigoriKeyName[] = "nigori-key";
 
-namespace syncer {
+namespace syncer_v2 {
+
+using syncer::Cryptographer;
+using syncer::CommitContribution;
+using syncer::KeyParams;
+using syncer::Nigori;
+using syncer::sessions::StatusController;
 
 // Tests the ModelTypeSyncWorkerImpl.
 //
@@ -72,12 +78,11 @@ class ModelTypeSyncWorkerImplTest : public ::testing::Test {
 
   // Initialize with some saved pending updates from the model thread.
   void InitializeWithPendingUpdates(
-      const syncer_v2::UpdateResponseDataList& initial_pending_updates);
+      const UpdateResponseDataList& initial_pending_updates);
 
   // Initialize with a custom initial DataTypeState and pending updates.
-  void InitializeWithState(
-      const syncer_v2::DataTypeState& state,
-      const syncer_v2::UpdateResponseDataList& pending_updates);
+  void InitializeWithState(const DataTypeState& state,
+                           const UpdateResponseDataList& pending_updates);
 
   // Introduce a new key that the local cryptographer can't decrypt.
   void NewForeignEncryptionKey();
@@ -137,32 +142,29 @@ class ModelTypeSyncWorkerImplTest : public ::testing::Test {
   // Note that if the model thread is in non-blocking mode, this data will not
   // be updated until the response is actually processed by the model thread.
   size_t GetNumModelThreadUpdateResponses() const;
-  syncer_v2::UpdateResponseDataList GetNthModelThreadUpdateResponse(
-      size_t n) const;
-  syncer_v2::UpdateResponseDataList GetNthModelThreadPendingUpdates(
-      size_t n) const;
-  syncer_v2::DataTypeState GetNthModelThreadUpdateState(size_t n) const;
+  UpdateResponseDataList GetNthModelThreadUpdateResponse(size_t n) const;
+  UpdateResponseDataList GetNthModelThreadPendingUpdates(size_t n) const;
+  DataTypeState GetNthModelThreadUpdateState(size_t n) const;
 
   // Reads the latest update response datas on the model thread.
   // Note that if the model thread is in non-blocking mode, this data will not
   // be updated until the response is actually processed by the model thread.
   bool HasUpdateResponseOnModelThread(const std::string& tag) const;
-  syncer_v2::UpdateResponseData GetUpdateResponseOnModelThread(
+  UpdateResponseData GetUpdateResponseOnModelThread(
       const std::string& tag) const;
 
   // Read the latest commit messages received on the model thread.
   // Note that if the model thread is in non-blocking mode, this data will not
   // be updated until the response is actually processed by the model thread.
   size_t GetNumModelThreadCommitResponses() const;
-  syncer_v2::CommitResponseDataList GetNthModelThreadCommitResponse(
-      size_t n) const;
-  syncer_v2::DataTypeState GetNthModelThreadCommitState(size_t n) const;
+  CommitResponseDataList GetNthModelThreadCommitResponse(size_t n) const;
+  DataTypeState GetNthModelThreadCommitState(size_t n) const;
 
   // Reads the latest commit response datas on the model thread.
   // Note that if the model thread is in non-blocking mode, this data will not
   // be updated until the response is actually processed by the model thread.
   bool HasCommitResponseOnModelThread(const std::string& tag) const;
-  syncer_v2::CommitResponseData GetCommitResponseOnModelThread(
+  CommitResponseData GetCommitResponseOnModelThread(
       const std::string& tag) const;
 
   // Returns the number of commit nudges sent to the mock nudge handler.
@@ -198,7 +200,7 @@ class ModelTypeSyncWorkerImplTest : public ::testing::Test {
 
  private:
   // An encryptor for our cryptographer.
-  FakeEncryptor fake_encryptor_;
+  syncer::FakeEncryptor fake_encryptor_;
 
   // The cryptographer itself.  NULL if we're not encrypting the type.
   scoped_ptr<Cryptographer> cryptographer_;
@@ -221,11 +223,11 @@ class ModelTypeSyncWorkerImplTest : public ::testing::Test {
   // A mock that emulates enough of the sync server that it can be used
   // a single UpdateHandler and CommitContributor pair.  In this test
   // harness, the |worker_| is both of them.
-  SingleTypeMockServer mock_server_;
+  syncer::SingleTypeMockServer mock_server_;
 
   // A mock to track the number of times the ModelTypeSyncWorker requests to
   // sync.
-  MockNudgeHandler mock_nudge_handler_;
+  syncer::MockNudgeHandler mock_nudge_handler_;
 };
 
 ModelTypeSyncWorkerImplTest::ModelTypeSyncWorkerImplTest()
@@ -239,20 +241,20 @@ ModelTypeSyncWorkerImplTest::~ModelTypeSyncWorkerImplTest() {
 }
 
 void ModelTypeSyncWorkerImplTest::FirstInitialize() {
-  syncer_v2::DataTypeState initial_state;
+  DataTypeState initial_state;
   initial_state.progress_marker.set_data_type_id(
       GetSpecificsFieldNumberFromModelType(kModelType));
 
-  InitializeWithState(initial_state, syncer_v2::UpdateResponseDataList());
+  InitializeWithState(initial_state, UpdateResponseDataList());
 }
 
 void ModelTypeSyncWorkerImplTest::NormalInitialize() {
-  InitializeWithPendingUpdates(syncer_v2::UpdateResponseDataList());
+  InitializeWithPendingUpdates(UpdateResponseDataList());
 }
 
 void ModelTypeSyncWorkerImplTest::InitializeWithPendingUpdates(
-    const syncer_v2::UpdateResponseDataList& initial_pending_updates) {
-  syncer_v2::DataTypeState initial_state;
+    const UpdateResponseDataList& initial_pending_updates) {
+  DataTypeState initial_state;
   initial_state.progress_marker.set_data_type_id(
       GetSpecificsFieldNumberFromModelType(kModelType));
   initial_state.progress_marker.set_token("some_saved_progress_token");
@@ -265,8 +267,8 @@ void ModelTypeSyncWorkerImplTest::InitializeWithPendingUpdates(
 }
 
 void ModelTypeSyncWorkerImplTest::InitializeWithState(
-    const syncer_v2::DataTypeState& state,
-    const syncer_v2::UpdateResponseDataList& initial_pending_updates) {
+    const DataTypeState& state,
+    const UpdateResponseDataList& initial_pending_updates) {
   DCHECK(!worker_);
 
   // We don't get to own this object.  The |worker_| keeps a scoped_ptr to it.
@@ -328,7 +330,7 @@ void ModelTypeSyncWorkerImplTest::NewForeignEncryptionKey() {
   // Update the worker with the latest cryptographer.
   if (worker_) {
     worker_->UpdateCryptographer(
-        make_scoped_ptr<Cryptographer>(new Cryptographer(*cryptographer_)));
+        make_scoped_ptr(new Cryptographer(*cryptographer_)));
   }
 }
 
@@ -344,7 +346,7 @@ void ModelTypeSyncWorkerImplTest::UpdateLocalCryptographer() {
   // Update the worker with the latest cryptographer.
   if (worker_) {
     worker_->UpdateCryptographer(
-        make_scoped_ptr<Cryptographer>(new Cryptographer(*cryptographer_)));
+        make_scoped_ptr(new Cryptographer(*cryptographer_)));
   }
 }
 
@@ -355,18 +357,17 @@ void ModelTypeSyncWorkerImplTest::SetUpdateEncryptionFilter(int n) {
 void ModelTypeSyncWorkerImplTest::CommitRequest(const std::string& name,
                                                 const std::string& value) {
   const std::string tag_hash = GenerateTagHash(name);
-  syncer_v2::CommitRequestData data = mock_type_sync_proxy_->CommitRequest(
+  CommitRequestData data = mock_type_sync_proxy_->CommitRequest(
       tag_hash, GenerateSpecifics(name, value));
-  syncer_v2::CommitRequestDataList list;
+  CommitRequestDataList list;
   list.push_back(data);
   worker_->EnqueueForCommit(list);
 }
 
 void ModelTypeSyncWorkerImplTest::DeleteRequest(const std::string& tag) {
   const std::string tag_hash = GenerateTagHash(tag);
-  syncer_v2::CommitRequestData data =
-      mock_type_sync_proxy_->DeleteRequest(tag_hash);
-  syncer_v2::CommitRequestDataList list;
+  CommitRequestData data = mock_type_sync_proxy_->DeleteRequest(tag_hash);
+  CommitRequestDataList list;
   list.push_back(data);
   worker_->EnqueueForCommit(list);
 }
@@ -376,7 +377,7 @@ void ModelTypeSyncWorkerImplTest::TriggerTypeRootUpdateFromServer() {
   SyncEntityList entity_list;
   entity_list.push_back(&entity);
 
-  sessions::StatusController dummy_status;
+  StatusController dummy_status;
 
   worker_->ProcessGetUpdatesResponse(mock_server_.GetProgress(),
                                      mock_server_.GetContext(),
@@ -400,7 +401,7 @@ void ModelTypeSyncWorkerImplTest::TriggerUpdateFromServer(
   SyncEntityList entity_list;
   entity_list.push_back(&entity);
 
-  sessions::StatusController dummy_status;
+  StatusController dummy_status;
 
   worker_->ProcessGetUpdatesResponse(mock_server_.GetProgress(),
                                      mock_server_.GetContext(),
@@ -411,7 +412,7 @@ void ModelTypeSyncWorkerImplTest::TriggerUpdateFromServer(
 
 void ModelTypeSyncWorkerImplTest::DeliverRawUpdates(
     const SyncEntityList& list) {
-  sessions::StatusController dummy_status;
+  StatusController dummy_status;
   worker_->ProcessGetUpdatesResponse(mock_server_.GetProgress(),
                                      mock_server_.GetContext(),
                                      list,
@@ -433,7 +434,7 @@ void ModelTypeSyncWorkerImplTest::TriggerTombstoneFromServer(
   SyncEntityList entity_list;
   entity_list.push_back(&entity);
 
-  sessions::StatusController dummy_status;
+  StatusController dummy_status;
 
   worker_->ProcessGetUpdatesResponse(mock_server_.GetProgress(),
                                      mock_server_.GetContext(),
@@ -478,7 +479,7 @@ void ModelTypeSyncWorkerImplTest::DoSuccessfulCommit() {
   sync_pb::ClientToServerResponse response =
       mock_server_.DoSuccessfulCommit(message);
 
-  sessions::StatusController dummy_status;
+  StatusController dummy_status;
   contribution->ProcessCommitResponse(response, &dummy_status);
   contribution->CleanUp();
 }
@@ -510,20 +511,20 @@ size_t ModelTypeSyncWorkerImplTest::GetNumModelThreadUpdateResponses() const {
   return mock_type_sync_proxy_->GetNumUpdateResponses();
 }
 
-syncer_v2::UpdateResponseDataList
+UpdateResponseDataList
 ModelTypeSyncWorkerImplTest::GetNthModelThreadUpdateResponse(size_t n) const {
   DCHECK_LT(n, GetNumModelThreadUpdateResponses());
   return mock_type_sync_proxy_->GetNthUpdateResponse(n);
 }
 
-syncer_v2::UpdateResponseDataList
+UpdateResponseDataList
 ModelTypeSyncWorkerImplTest::GetNthModelThreadPendingUpdates(size_t n) const {
   DCHECK_LT(n, GetNumModelThreadUpdateResponses());
   return mock_type_sync_proxy_->GetNthPendingUpdates(n);
 }
 
-syncer_v2::DataTypeState
-ModelTypeSyncWorkerImplTest::GetNthModelThreadUpdateState(size_t n) const {
+DataTypeState ModelTypeSyncWorkerImplTest::GetNthModelThreadUpdateState(
+    size_t n) const {
   DCHECK_LT(n, GetNumModelThreadUpdateResponses());
   return mock_type_sync_proxy_->GetNthTypeStateReceivedInUpdateResponse(n);
 }
@@ -534,8 +535,7 @@ bool ModelTypeSyncWorkerImplTest::HasUpdateResponseOnModelThread(
   return mock_type_sync_proxy_->HasUpdateResponse(tag_hash);
 }
 
-syncer_v2::UpdateResponseData
-ModelTypeSyncWorkerImplTest::GetUpdateResponseOnModelThread(
+UpdateResponseData ModelTypeSyncWorkerImplTest::GetUpdateResponseOnModelThread(
     const std::string& tag) const {
   const std::string tag_hash = GenerateTagHash(tag);
   return mock_type_sync_proxy_->GetUpdateResponse(tag_hash);
@@ -545,14 +545,14 @@ size_t ModelTypeSyncWorkerImplTest::GetNumModelThreadCommitResponses() const {
   return mock_type_sync_proxy_->GetNumCommitResponses();
 }
 
-syncer_v2::CommitResponseDataList
+CommitResponseDataList
 ModelTypeSyncWorkerImplTest::GetNthModelThreadCommitResponse(size_t n) const {
   DCHECK_LT(n, GetNumModelThreadCommitResponses());
   return mock_type_sync_proxy_->GetNthCommitResponse(n);
 }
 
-syncer_v2::DataTypeState
-ModelTypeSyncWorkerImplTest::GetNthModelThreadCommitState(size_t n) const {
+DataTypeState ModelTypeSyncWorkerImplTest::GetNthModelThreadCommitState(
+    size_t n) const {
   DCHECK_LT(n, GetNumModelThreadCommitResponses());
   return mock_type_sync_proxy_->GetNthTypeStateReceivedInCommitResponse(n);
 }
@@ -563,8 +563,7 @@ bool ModelTypeSyncWorkerImplTest::HasCommitResponseOnModelThread(
   return mock_type_sync_proxy_->HasCommitResponse(tag_hash);
 }
 
-syncer_v2::CommitResponseData
-ModelTypeSyncWorkerImplTest::GetCommitResponseOnModelThread(
+CommitResponseData ModelTypeSyncWorkerImplTest::GetCommitResponseOnModelThread(
     const std::string& tag) const {
   DCHECK(HasCommitResponseOnModelThread(tag));
   const std::string tag_hash = GenerateTagHash(tag);
@@ -591,7 +590,7 @@ std::string ModelTypeSyncWorkerImplTest::GetLocalCryptographerKeyName() const {
 std::string ModelTypeSyncWorkerImplTest::GenerateTagHash(
     const std::string& tag) {
   const std::string& client_tag_hash =
-      syncable::GenerateSyncableHash(kModelType, tag);
+      syncer::syncable::GenerateSyncableHash(kModelType, tag);
   return client_tag_hash;
 }
 
@@ -675,7 +674,7 @@ TEST_F(ModelTypeSyncWorkerImplTest, SimpleCommit) {
   ASSERT_TRUE(HasCommitEntityOnServer("tag1"));
   const sync_pb::SyncEntity& entity = GetLatestCommitEntityOnServer("tag1");
   EXPECT_FALSE(entity.id_string().empty());
-  EXPECT_EQ(syncer_v2::kUncommittedVersion, entity.version());
+  EXPECT_EQ(kUncommittedVersion, entity.version());
   EXPECT_NE(0, entity.mtime());
   EXPECT_NE(0, entity.ctime());
   EXPECT_FALSE(entity.name().empty());
@@ -688,7 +687,7 @@ TEST_F(ModelTypeSyncWorkerImplTest, SimpleCommit) {
   ASSERT_EQ(1U, GetNumModelThreadCommitResponses());
   EXPECT_EQ(1U, GetNthModelThreadCommitResponse(0).size());
   ASSERT_TRUE(HasCommitResponseOnModelThread("tag1"));
-  const syncer_v2::CommitResponseData& commit_response =
+  const CommitResponseData& commit_response =
       GetCommitResponseOnModelThread("tag1");
 
   // The ID changes in a commit response to initial commit.
@@ -710,7 +709,7 @@ TEST_F(ModelTypeSyncWorkerImplTest, SimpleDelete) {
   DoSuccessfulCommit();
 
   ASSERT_TRUE(HasCommitResponseOnModelThread("tag1"));
-  const syncer_v2::CommitResponseData& initial_commit_response =
+  const CommitResponseData& initial_commit_response =
       GetCommitResponseOnModelThread("tag1");
   int64 base_version = initial_commit_response.response_version;
 
@@ -731,13 +730,13 @@ TEST_F(ModelTypeSyncWorkerImplTest, SimpleDelete) {
 
   // Deletions should contain enough specifics to identify the type.
   EXPECT_TRUE(entity.has_specifics());
-  EXPECT_EQ(kModelType, GetModelTypeFromSpecifics(entity.specifics()));
+  EXPECT_EQ(kModelType, syncer::GetModelTypeFromSpecifics(entity.specifics()));
 
   // Verify the commit response returned to the model thread.
   ASSERT_EQ(2U, GetNumModelThreadCommitResponses());
   EXPECT_EQ(1U, GetNthModelThreadCommitResponse(1).size());
   ASSERT_TRUE(HasCommitResponseOnModelThread("tag1"));
-  const syncer_v2::CommitResponseData& commit_response =
+  const CommitResponseData& commit_response =
       GetCommitResponseOnModelThread("tag1");
 
   EXPECT_EQ(entity.id_string(), commit_response.id);
@@ -781,7 +780,7 @@ TEST_F(ModelTypeSyncWorkerImplTest, SendInitialSyncDone) {
   EXPECT_EQ(0U, GetNthModelThreadUpdateResponse(0).size());
   EXPECT_EQ(0U, GetNthModelThreadUpdateResponse(1).size());
 
-  const syncer_v2::DataTypeState& state = GetNthModelThreadUpdateState(1);
+  const DataTypeState& state = GetNthModelThreadUpdateState(1);
   EXPECT_FALSE(state.progress_marker.token().empty());
   EXPECT_TRUE(state.initial_sync_done);
 }
@@ -835,12 +834,11 @@ TEST_F(ModelTypeSyncWorkerImplTest, ReceiveUpdates) {
   TriggerUpdateFromServer(10, "tag1", "value1");
 
   ASSERT_EQ(1U, GetNumModelThreadUpdateResponses());
-  syncer_v2::UpdateResponseDataList updates_list =
-      GetNthModelThreadUpdateResponse(0);
+  UpdateResponseDataList updates_list = GetNthModelThreadUpdateResponse(0);
   ASSERT_EQ(1U, updates_list.size());
 
   ASSERT_TRUE(HasUpdateResponseOnModelThread("tag1"));
-  syncer_v2::UpdateResponseData update = GetUpdateResponseOnModelThread("tag1");
+  UpdateResponseData update = GetUpdateResponseOnModelThread("tag1");
 
   EXPECT_FALSE(update.id.empty());
   EXPECT_EQ(tag_hash, update.client_tag_hash);
@@ -932,8 +930,7 @@ TEST_F(ModelTypeSyncWorkerImplTest, ReceiveDecryptableEntities) {
 
   // Test some basic properties regarding the update.
   ASSERT_TRUE(HasUpdateResponseOnModelThread("tag1"));
-  syncer_v2::UpdateResponseData update1 =
-      GetUpdateResponseOnModelThread("tag1");
+  UpdateResponseData update1 = GetUpdateResponseOnModelThread("tag1");
   EXPECT_EQ("tag1", update1.specifics.preference().name());
   EXPECT_EQ("value1", update1.specifics.preference().value());
   EXPECT_TRUE(update1.encryption_key_name.empty());
@@ -946,8 +943,7 @@ TEST_F(ModelTypeSyncWorkerImplTest, ReceiveDecryptableEntities) {
 
   // Test its basic features and the value of encryption_key_name.
   ASSERT_TRUE(HasUpdateResponseOnModelThread("tag2"));
-  syncer_v2::UpdateResponseData update2 =
-      GetUpdateResponseOnModelThread("tag2");
+  UpdateResponseData update2 = GetUpdateResponseOnModelThread("tag2");
   EXPECT_EQ("tag2", update2.specifics.preference().name());
   EXPECT_EQ("value2", update2.specifics.preference().value());
   EXPECT_FALSE(update2.encryption_key_name.empty());
@@ -986,17 +982,15 @@ TEST_F(ModelTypeSyncWorkerImplTest, ReceiveUndecryptableEntries) {
   // updates will be undecryptable.  They'll be transfered to the model thread
   // for safe-keeping as pending updates.
   ASSERT_EQ(1U, GetNumModelThreadUpdateResponses());
-  syncer_v2::UpdateResponseDataList updates_list =
-      GetNthModelThreadUpdateResponse(0);
+  UpdateResponseDataList updates_list = GetNthModelThreadUpdateResponse(0);
   EXPECT_EQ(0U, updates_list.size());
-  syncer_v2::UpdateResponseDataList pending_updates =
-      GetNthModelThreadPendingUpdates(0);
+  UpdateResponseDataList pending_updates = GetNthModelThreadPendingUpdates(0);
   EXPECT_EQ(1U, pending_updates.size());
 
   // The update will be delivered as soon as decryption becomes possible.
   UpdateLocalCryptographer();
   ASSERT_TRUE(HasUpdateResponseOnModelThread("tag1"));
-  syncer_v2::UpdateResponseData update = GetUpdateResponseOnModelThread("tag1");
+  UpdateResponseData update = GetUpdateResponseOnModelThread("tag1");
   EXPECT_EQ("tag1", update.specifics.preference().name());
   EXPECT_EQ("value1", update.specifics.preference().value());
   EXPECT_FALSE(update.encryption_key_name.empty());
@@ -1019,18 +1013,16 @@ TEST_F(ModelTypeSyncWorkerImplTest, EncryptedUpdateOverridesPendingCommit) {
 
   // The encrypted update will be delivered to the model thread.
   ASSERT_EQ(1U, GetNumModelThreadUpdateResponses());
-  syncer_v2::UpdateResponseDataList updates_list =
-      GetNthModelThreadUpdateResponse(0);
+  UpdateResponseDataList updates_list = GetNthModelThreadUpdateResponse(0);
   EXPECT_EQ(0U, updates_list.size());
-  syncer_v2::UpdateResponseDataList pending_updates =
-      GetNthModelThreadPendingUpdates(0);
+  UpdateResponseDataList pending_updates = GetNthModelThreadPendingUpdates(0);
   EXPECT_EQ(1U, pending_updates.size());
 }
 
 // Test decryption of pending updates saved across a restart.
 TEST_F(ModelTypeSyncWorkerImplTest, RestorePendingEntries) {
   // Create a fake pending update.
-  syncer_v2::UpdateResponseData update;
+  UpdateResponseData update;
 
   update.client_tag_hash = GenerateTagHash("tag1");
   update.id = "SomeID";
@@ -1044,7 +1036,7 @@ TEST_F(ModelTypeSyncWorkerImplTest, RestorePendingEntries) {
   EncryptUpdate(GetNthKeyParams(1), &(update.specifics));
 
   // Inject the update during ModelTypeSyncWorker initialization.
-  syncer_v2::UpdateResponseDataList saved_pending_updates;
+  UpdateResponseDataList saved_pending_updates;
   saved_pending_updates.push_back(update);
   InitializeWithPendingUpdates(saved_pending_updates);
 
@@ -1069,7 +1061,7 @@ TEST_F(ModelTypeSyncWorkerImplTest, RestoreApplicableEntries) {
   UpdateLocalCryptographer();
 
   // Create a fake pending update.
-  syncer_v2::UpdateResponseData update;
+  UpdateResponseData update;
   update.client_tag_hash = GenerateTagHash("tag1");
   update.id = "SomeID";
   update.response_version = 100;
@@ -1082,7 +1074,7 @@ TEST_F(ModelTypeSyncWorkerImplTest, RestoreApplicableEntries) {
   EncryptUpdate(GetNthKeyParams(1), &(update.specifics));
 
   // Inject the update during ModelTypeSyncWorker initialization.
-  syncer_v2::UpdateResponseDataList saved_pending_updates;
+  UpdateResponseDataList saved_pending_updates;
   saved_pending_updates.push_back(update);
   InitializeWithPendingUpdates(saved_pending_updates);