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

components/sync_sessions/session_data_type_controller_unittest.cc

Index: components/sync_sessions/session_data_type_controller_unittest.cc
diff --git a/components/sync_sessions/session_data_type_controller_unittest.cc b/components/sync_sessions/session_data_type_controller_unittest.cc
index b92c8c4a80f5b71636f0654e96227148701fde68..5dc16c41be13054d1b44b45883007783988c58e5 100644
--- a/components/sync_sessions/session_data_type_controller_unittest.cc
+++ b/components/sync_sessions/session_data_type_controller_unittest.cc
@@ -23,7 +23,7 @@
 #include "components/sync_sessions/synced_window_delegates_getter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using sync_driver::LocalDeviceInfoProviderMock;
+using syncer::LocalDeviceInfoProviderMock;
 
 namespace sync_sessions {
 
@@ -95,10 +95,10 @@ class TestSyncSessionsClient : public FakeSyncSessionsClient {
 };
 
 class SessionDataTypeControllerTest : public testing::Test,
-                                      public sync_driver::FakeSyncClient {
+                                      public syncer::FakeSyncClient {
  public:
   SessionDataTypeControllerTest()
-      : sync_driver::FakeSyncClient(&profile_sync_factory_),
+      : syncer::FakeSyncClient(&profile_sync_factory_),
         load_finished_(false),
         last_type_(syncer::UNSPECIFIED) {}
   ~SessionDataTypeControllerTest() override {}
@@ -184,7 +184,7 @@ class SessionDataTypeControllerTest : public testing::Test,
   TestingPrefServiceSimple prefs_;
   std::unique_ptr<MockSyncedWindowDelegate> synced_window_delegate_;
   std::unique_ptr<MockSyncedWindowDelegatesGetter> synced_window_getter_;
-  SyncApiComponentFactoryMock profile_sync_factory_;
+  syncer::SyncApiComponentFactoryMock profile_sync_factory_;
   std::unique_ptr<TestSyncSessionsClient> sync_sessions_client_;
   std::unique_ptr<LocalDeviceInfoProviderMock> local_device_;
   std::unique_ptr<SessionDataTypeController> controller_;
@@ -196,8 +196,7 @@ class SessionDataTypeControllerTest : public testing::Test,
 
 TEST_F(SessionDataTypeControllerTest, StartModels) {
   Start();
-  EXPECT_EQ(sync_driver::DataTypeController::MODEL_LOADED,
-            controller()->state());
+  EXPECT_EQ(syncer::DataTypeController::MODEL_LOADED, controller()->state());
   EXPECT_TRUE(LoadResult());
 }
 
@@ -205,12 +204,10 @@ TEST_F(SessionDataTypeControllerTest, StartModelsDelayedByLocalDevice) {
   local_device()->SetInitialized(false);
   Start();
   EXPECT_FALSE(load_finished());
-  EXPECT_EQ(sync_driver::DataTypeController::MODEL_STARTING,
-            controller()->state());
+  EXPECT_EQ(syncer::DataTypeController::MODEL_STARTING, controller()->state());
 
   local_device()->SetInitialized(true);
-  EXPECT_EQ(sync_driver::DataTypeController::MODEL_LOADED,
-            controller()->state());
+  EXPECT_EQ(syncer::DataTypeController::MODEL_LOADED, controller()->state());
   EXPECT_TRUE(LoadResult());
 }
 
@@ -218,12 +215,10 @@ TEST_F(SessionDataTypeControllerTest, StartModelsDelayedByRestoreInProgress) {
   SetSessionRestoreInProgress(true);
   Start();
   EXPECT_FALSE(load_finished());
-  EXPECT_EQ(sync_driver::DataTypeController::MODEL_STARTING,
-            controller()->state());
+  EXPECT_EQ(syncer::DataTypeController::MODEL_STARTING, controller()->state());
 
   SetSessionRestoreInProgress(false);
-  EXPECT_EQ(sync_driver::DataTypeController::MODEL_LOADED,
-            controller()->state());
+  EXPECT_EQ(syncer::DataTypeController::MODEL_LOADED, controller()->state());
   EXPECT_TRUE(LoadResult());
 }
 
@@ -233,17 +228,14 @@ TEST_F(SessionDataTypeControllerTest,
   SetSessionRestoreInProgress(true);
   Start();
   EXPECT_FALSE(load_finished());
-  EXPECT_EQ(sync_driver::DataTypeController::MODEL_STARTING,
-            controller()->state());
+  EXPECT_EQ(syncer::DataTypeController::MODEL_STARTING, controller()->state());
 
   local_device()->SetInitialized(true);
   EXPECT_FALSE(load_finished());
-  EXPECT_EQ(sync_driver::DataTypeController::MODEL_STARTING,
-            controller()->state());
+  EXPECT_EQ(syncer::DataTypeController::MODEL_STARTING, controller()->state());
 
   SetSessionRestoreInProgress(false);
-  EXPECT_EQ(sync_driver::DataTypeController::MODEL_LOADED,
-            controller()->state());
+  EXPECT_EQ(syncer::DataTypeController::MODEL_LOADED, controller()->state());
   EXPECT_TRUE(LoadResult());
 }
 
@@ -253,17 +245,14 @@ TEST_F(SessionDataTypeControllerTest,
   SetSessionRestoreInProgress(true);
   Start();
   EXPECT_FALSE(load_finished());
-  EXPECT_EQ(sync_driver::DataTypeController::MODEL_STARTING,
-            controller()->state());
+  EXPECT_EQ(syncer::DataTypeController::MODEL_STARTING, controller()->state());
 
   SetSessionRestoreInProgress(false);
   EXPECT_FALSE(load_finished());
-  EXPECT_EQ(sync_driver::DataTypeController::MODEL_STARTING,
-            controller()->state());
+  EXPECT_EQ(syncer::DataTypeController::MODEL_STARTING, controller()->state());
 
   local_device()->SetInitialized(true);
-  EXPECT_EQ(sync_driver::DataTypeController::MODEL_LOADED,
-            controller()->state());
+  EXPECT_EQ(syncer::DataTypeController::MODEL_LOADED, controller()->state());
   EXPECT_TRUE(LoadResult());
 }