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

components/sync/device_info/device_info_data_type_controller_unittest.cc

Index: components/sync/device_info/device_info_data_type_controller_unittest.cc
diff --git a/components/sync/device_info/device_info_data_type_controller_unittest.cc b/components/sync/device_info/device_info_data_type_controller_unittest.cc
index 5ffd5411ce9d00c4be0fe2126a5f6ab762b1b21f..b4c21d8e3aa45530da125dc84db35dad74701d51 100644
--- a/components/sync/device_info/device_info_data_type_controller_unittest.cc
+++ b/components/sync/device_info/device_info_data_type_controller_unittest.cc
@@ -15,7 +15,7 @@
 #include "components/sync/driver/sync_api_component_factory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace syncer {
+namespace sync_driver {
 
 namespace {
 
@@ -23,7 +23,7 @@ class DeviceInfoDataTypeControllerTest : public testing::Test {
  public:
   DeviceInfoDataTypeControllerTest()
       : load_finished_(false),
-        last_type_(UNSPECIFIED),
+        last_type_(syncer::UNSPECIFIED),
         weak_ptr_factory_(this) {}
   ~DeviceInfoDataTypeControllerTest() override {}
 
@@ -36,8 +36,8 @@ class DeviceInfoDataTypeControllerTest : public testing::Test {
         base::Closure(), &sync_client_, local_device_.get()));
 
     load_finished_ = false;
-    last_type_ = UNSPECIFIED;
-    last_error_ = SyncError();
+    last_type_ = syncer::UNSPECIFIED;
+    last_error_ = syncer::SyncError();
   }
 
   void TearDown() override {
@@ -51,7 +51,7 @@ class DeviceInfoDataTypeControllerTest : public testing::Test {
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
-  void OnLoadFinished(ModelType type, const SyncError& error) {
+  void OnLoadFinished(syncer::ModelType type, const syncer::SyncError& error) {
     load_finished_ = true;
     last_type_ = type;
     last_error_ = error;
@@ -68,7 +68,7 @@ class DeviceInfoDataTypeControllerTest : public testing::Test {
              << last_error_.ToString();
     }
 
-    if (last_type_ != DEVICE_INFO) {
+    if (last_type_ != syncer::DEVICE_INFO) {
       return testing::AssertionFailure()
              << "OnLoadFinished was called with a wrong sync type: "
              << last_type_;
@@ -84,8 +84,8 @@ class DeviceInfoDataTypeControllerTest : public testing::Test {
 
  private:
   base::MessageLoopForUI message_loop_;
-  ModelType last_type_;
-  SyncError last_error_;
+  syncer::ModelType last_type_;
+  syncer::SyncError last_error_;
   FakeSyncClient sync_client_;
   base::WeakPtrFactory<DeviceInfoDataTypeControllerTest> weak_ptr_factory_;
 };
@@ -122,4 +122,4 @@ TEST_F(DeviceInfoDataTypeControllerTest, DestructionWithDelayedStart) {
 
 }  // namespace
 
-}  // namespace syncer
+}  // namespace sync_driver