sync: Make ProfileSyncService a ProfileKeyedService.

chrome/browser/sync/profile_sync_service_startup_unittest.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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 "testing/gtest/include/gtest/gtest.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "chrome/browser/net/gaia/token_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/sync/glue/data_type_manager.h"
@@ skipping 50 matching lines @@
     // posting on the IO thread).
     ui_loop_.RunAllPending();
     io_thread_.Stop();
     file_thread_.Stop();
     ui_loop_.RunAllPending();
   }
 
  protected:
   // Overridden below by ProfileSyncServiceStartupCrosTest.
   virtual void CreateSyncService() {
-    service_.reset(new TestProfileSyncService(&factory_,
-                                              profile_.get(),
-                                              new FakeSigninManager(),
-                                              ProfileSyncService::MANUAL_START,
-                                              true,
-                                              base::Closure()));
+    service_.reset(new TestProfileSyncService(
+        new ProfileSyncComponentsFactoryMock(),
+        profile_.get(),
+        new FakeSigninManager(),
+        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_;
 };
 
 class ProfileSyncServiceStartupCrosTest : public ProfileSyncServiceStartupTest {
  protected:
   virtual void CreateSyncService() {
     SigninManager* signin = new SigninManager();
     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()));
   }
 };
 
 TEST_F(ProfileSyncServiceStartupTest, StartFirstTime) {
   DataTypeManagerMock* data_type_manager = SetUpDataTypeManager();
   EXPECT_CALL(*data_type_manager, Configure(_, _)).Times(0);
 
   // We've never completed startup.
   profile_->GetPrefs()->ClearPref(prefs::kSyncHasSetupCompleted);
 
@@ skipping 56 matching lines @@
   profile_->GetTokenService()->IssueAuthTokenForTest(
       GaiaConstants::kSyncService, "sync_token");
   profile_->GetPrefs()->SetString(prefs::kGoogleServicesUsername, "test_user");
   service_->Initialize();
 }
 
 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.
   profile_->GetTokenService()->IssueAuthTokenForTest(
       GaiaConstants::kSyncService, "sync_token");
   profile_->GetPrefs()->SetString(prefs::kGoogleServicesUsername, "test_user");
   service_->Initialize();
 }
 
 TEST_F(ProfileSyncServiceStartupTest, SwitchManaged) {
@@ skipping 10 matching lines @@
   Mock::VerifyAndClearExpectations(data_type_manager);
   EXPECT_CALL(*data_type_manager, state()).
       WillOnce(Return(DataTypeManager::CONFIGURED));
   EXPECT_CALL(*data_type_manager, Stop()).Times(1);
   EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
   profile_->GetPrefs()->SetBoolean(prefs::kSyncManaged, true);
 
   // 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);
 }
 
 TEST_F(ProfileSyncServiceStartupTest, ClearServerData) {
   DataTypeManagerMock* data_type_manager = SetUpDataTypeManager();
   EXPECT_CALL(*data_type_manager, Configure(_, _)).Times(1);
   EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
 
   profile_->GetTokenService()->IssueAuthTokenForTest(
@@ skipping 94 matching lines @@
 
   // Preload the tokens.
   profile_->GetTokenService()->IssueAuthTokenForTest(
       GaiaConstants::kSyncService, "sync_token");
   service_->fail_initial_download();
 
   service_->Initialize();
   EXPECT_FALSE(service_->sync_initialized());
   EXPECT_FALSE(service_->GetBackendForTest());
 }