sync: Make ProfileSyncService a ProfileKeyedService.

chrome/browser/sync/profile_sync_service_startup_unittest.cc

Index: chrome/browser/sync/profile_sync_service_startup_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_startup_unittest.cc b/chrome/browser/sync/profile_sync_service_startup_unittest.cc
index a39ff0bbbabdd5eb4dfa9e49b1b030426aef9e8e..e15ed89b5dd53ea08a11a25533441864064df97a 100644
--- a/chrome/browser/sync/profile_sync_service_startup_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_startup_unittest.cc
@@ -73,27 +73,31 @@ class ProfileSyncServiceStartupTest : public testing::Test {
     SigninManager* signin = new FakeSigninManager();
     signin->SetAuthenticatedUsername("test_user");
     profile_->SetSigninManager(signin);
-    service_.reset(new TestProfileSyncService(&factory_,
-                                              profile_.get(),
-                                              signin,
-                                              ProfileSyncService::MANUAL_START,
-                                              true,
-                                              base::Closure()));
+    service_.reset(new TestProfileSyncService(
+        new ProfileSyncComponentsFactoryMock(),
+        profile_.get(),
+        signin,
+        ProfileSyncService::MANUAL_START,
+        true,
+        base::Closure()));
   }
 
   DataTypeManagerMock* SetUpDataTypeManager() {
     DataTypeManagerMock* data_type_manager = new DataTypeManagerMock();
-    EXPECT_CALL(factory_, CreateDataTypeManager(_, _)).
+    EXPECT_CALL(*factory_mock(), CreateDataTypeManager(_, _)).
         WillOnce(Return(data_type_manager));
     return data_type_manager;
   }
 
+  ProfileSyncComponentsFactoryMock* factory_mock() {
+   return static_cast<ProfileSyncComponentsFactoryMock*>(service_->factory());
+  }
+
   MessageLoop ui_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
   content::TestBrowserThread io_thread_;
   scoped_ptr<TestingProfile> profile_;
-  ProfileSyncComponentsFactoryMock factory_;
   scoped_ptr<TestProfileSyncService> service_;
   ProfileSyncServiceObserverMock observer_;
 };
@@ -103,12 +107,13 @@ class ProfileSyncServiceStartupCrosTest : public ProfileSyncServiceStartupTest {
   virtual void CreateSyncService() {
     SigninManager* signin = profile_->GetSigninManager();
     signin->SetAuthenticatedUsername("test_user");
-    service_.reset(new TestProfileSyncService(&factory_,
-                                              profile_.get(),
-                                              signin,
-                                              ProfileSyncService::AUTO_START,
-                                              true,
-                                              base::Closure()));
+    service_.reset(new TestProfileSyncService(
+        new ProfileSyncComponentsFactoryMock(),
+        profile_.get(),
+        signin,
+        ProfileSyncService::AUTO_START,
+        true,
+        base::Closure()));
   }
 };
 
@@ -188,7 +193,7 @@ TEST_F(ProfileSyncServiceStartupTest, ManagedStartup) {
   // Disable sync through policy.
   profile_->GetPrefs()->SetBoolean(prefs::kSyncManaged, true);
 
-  EXPECT_CALL(factory_, CreateDataTypeManager(_, _)).Times(0);
+  EXPECT_CALL(*factory_mock(), CreateDataTypeManager(_, _)).Times(0);
   EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
 
   // Service should not be started by Initialize() since it's managed.
@@ -219,7 +224,7 @@ TEST_F(ProfileSyncServiceStartupTest, SwitchManaged) {
   // When switching back to unmanaged, the state should change, but the service
   // should not start up automatically (kSyncSetupCompleted will be false).
   Mock::VerifyAndClearExpectations(data_type_manager);
-  EXPECT_CALL(factory_, CreateDataTypeManager(_, _)).Times(0);
+  EXPECT_CALL(*factory_mock(), CreateDataTypeManager(_, _)).Times(0);
   EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
   profile_->GetPrefs()->ClearPref(prefs::kSyncManaged);
 }