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

components/sync/engine_impl/model_type_worker_unittest.cc

 // 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.
 
 #include "components/sync/engine_impl/model_type_worker.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/stringprintf.h"
 #include "components/sync/base/fake_encryptor.h"
 #include "components/sync/base/model_type.h"
 #include "components/sync/core/model_type_processor.h"
 #include "components/sync/core/non_blocking_sync_common.h"
 #include "components/sync/engine_impl/commit_contribution.h"
 #include "components/sync/engine_impl/cycle/status_controller.h"
 #include "components/sync/protocol/data_type_state.pb.h"
 #include "components/sync/protocol/sync.pb.h"
 #include "components/sync/syncable/syncable_util.h"
 #include "components/sync/test/engine/mock_model_type_processor.h"
 #include "components/sync/test/engine/mock_nudge_handler.h"
 #include "components/sync/test/engine/single_type_mock_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace syncer {
+using syncer::Cryptographer;
+using syncer::CommitContribution;
+using syncer::KeyParams;
+using syncer::Nigori;
+using syncer::StatusController;
+
+namespace syncer_v2 {
 
 namespace {
 
 // Special constant value taken from cryptographer.cc.
 const char kNigoriKeyName[] = "nigori-key";
 
-const ModelType kModelType = PREFERENCES;
+const syncer::ModelType kModelType = syncer::PREFERENCES;
 
 std::string GenerateTagHash(const std::string& tag) {
-  return syncable::GenerateSyncableHash(kModelType, tag);
+  return syncer::syncable::GenerateSyncableHash(kModelType, tag);
 }
 
 const char kTag1[] = "tag1";
 const char kTag2[] = "tag2";
 const char kTag3[] = "tag3";
 const char kValue1[] = "value1";
 const char kValue2[] = "value2";
 const char kValue3[] = "value3";
 const std::string kHash1(GenerateTagHash(kTag1));
 const std::string kHash2(GenerateTagHash(kTag2));
@@ skipping 370 matching lines @@
   // in use. See also: UpdateLocalCryptographer().
   std::string GetLocalCryptographerKeyName() const {
     if (!cryptographer_) {
       return std::string();
     }
     return cryptographer_->GetDefaultNigoriKeyName();
   }
 
   MockModelTypeProcessor* processor() { return mock_type_processor_; }
   ModelTypeWorker* worker() { return worker_.get(); }
-  SingleTypeMockServer* server() { return &mock_server_; }
+  syncer::SingleTypeMockServer* server() { return &mock_server_; }
 
  private:
   // An encryptor for our cryptographer.
-  FakeEncryptor fake_encryptor_;
+  syncer::FakeEncryptor fake_encryptor_;
 
   // The cryptographer itself. Null if we're not encrypting the type.
   std::unique_ptr<Cryptographer> cryptographer_;
 
   // The number of the most recent foreign encryption key known to our
   // cryptographer. Note that not all of these will be decryptable.
   int foreign_encryption_key_index_;
 
   // The number of the encryption key used to encrypt incoming updates. A zero
   // value implies no encryption.
   int update_encryption_filter_index_;
 
   // The ModelTypeWorker being tested.
   std::unique_ptr<ModelTypeWorker> worker_;
 
   // Non-owned, possibly null pointer. This object belongs to the
   // ModelTypeWorker under test.
   MockModelTypeProcessor* mock_type_processor_;
 
   // 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 CommitQueue requests to
   // sync.
-  MockNudgeHandler mock_nudge_handler_;
+  syncer::MockNudgeHandler mock_nudge_handler_;
 
   bool is_processor_disconnected_;
 };
 
 // Requests a commit and verifies the messages sent to the client and server as
 // a result.
 //
 // This test performs sanity checks on most of the fields in these messages.
 // For the most part this is checking that the test code behaves as expected
 // and the |worker_| doesn't mess up its simple task of moving around these
@@ skipping 72 matching lines @@
   EXPECT_EQ(1, server()->GetNthCommitMessage(1).commit().entries_size());
   ASSERT_TRUE(server()->HasCommitEntity(kHash1));
   const sync_pb::SyncEntity& entity = server()->GetLastCommittedEntity(kHash1);
   EXPECT_FALSE(entity.id_string().empty());
   EXPECT_EQ(GenerateTagHash(kTag1), entity.client_defined_unique_tag());
   EXPECT_EQ(base_version, entity.version());
   EXPECT_TRUE(entity.deleted());
 
   // 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, processor()->GetNumCommitResponses());
   EXPECT_EQ(1U, processor()->GetNthCommitResponse(1).size());
   ASSERT_TRUE(processor()->HasCommitResponse(kHash1));
   const CommitResponseData& commit_response =
       processor()->GetCommitResponse(kHash1);
 
   EXPECT_EQ(entity.id_string(), commit_response.id);
   EXPECT_EQ(entity.client_defined_unique_tag(),
@@ skipping 457 matching lines @@
 // Test that processor has been disconnected from Sync when worker got
 // disconnected.
 TEST_F(ModelTypeWorkerTest, DisconnectProcessorFromSyncTest) {
   // Initialize the worker with basic state.
   NormalInitialize();
   EXPECT_FALSE(IsProcessorDisconnected());
   ResetWorker();
   EXPECT_TRUE(IsProcessorDisconnected());
 }
 
-}  // namespace syncer
+}  // namespace syncer_v2