Remove references to Profile from browser_context_keyed_service.

chrome/browser/sync/profile_sync_service_startup_unittest.cc

 // 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 "base/prefs/pref_service.h"
 #include "chrome/browser/signin/fake_signin_manager.h"
@@ skipping 87 matching lines @@
     profile_.reset();
 
     // Pump messages posted by the sync core thread (which may end up
     // posting on the IO thread).
     ui_loop_.RunUntilIdle();
     io_thread_.Stop();
     file_thread_.Stop();
     ui_loop_.RunUntilIdle();
   }
 
-  static ProfileKeyedService* BuildService(content::BrowserContext* profile) {
+  static BrowserContextKeyedService* BuildService(content::BrowserContext* profile) {
     return new TestProfileSyncService(
         new ProfileSyncComponentsFactoryMock(),
         static_cast<Profile*>(profile),
         SigninManagerFactory::GetForProfile(static_cast<Profile*>(profile)),
         ProfileSyncService::MANUAL_START,
         true);
   }
 
   void CreateSyncService() {
     sync_ = static_cast<TestProfileSyncService*>(
@@ skipping 26 matching lines @@
  public:
   virtual void SetUp() {
     ProfileSyncServiceStartupTest::SetUp();
     sync_ = static_cast<TestProfileSyncService*>(
         ProfileSyncServiceFactory::GetInstance()->SetTestingFactoryAndUse(
             profile_.get(), BuildCrosService));
     sync_->AddObserver(&observer_);
     sync_->set_synchronous_sync_configuration();
   }
 
-  static ProfileKeyedService* BuildCrosService(
+  static BrowserContextKeyedService* BuildCrosService(
       content::BrowserContext* context) {
     Profile* profile = static_cast<Profile*>(context);
     SigninManagerBase* signin =
         SigninManagerFactory::GetForProfile(profile);
     profile->GetPrefs()->SetString(prefs::kGoogleServicesUsername,
                                    "test_user");
     signin->Initialize(profile, NULL);
     EXPECT_FALSE(signin->GetAuthenticatedUsername().empty());
     return new TestProfileSyncService(
         new ProfileSyncComponentsFactoryMock(),
         profile,
         signin,
         ProfileSyncService::AUTO_START,
         true);
   }
 };
 
-ProfileKeyedService* BuildFakeTokenService(content::BrowserContext* profile) {
+BrowserContextKeyedService* BuildFakeTokenService(content::BrowserContext* profile) {
   return new FakeTokenService();
 }
 
 TEST_F(ProfileSyncServiceStartupTest, StartFirstTime) {
   // We've never completed startup.
   profile_->GetPrefs()->ClearPref(prefs::kSyncHasSetupCompleted);
   SigninManagerFactory::GetForProfile(
       profile_.get())->Initialize(profile_.get(), NULL);
   CreateSyncService();
   DataTypeManagerMock* data_type_manager = SetUpDataTypeManager();
@@ skipping 339 matching lines @@
 
   EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
   TokenServiceFactory::GetForProfile(profile_.get())->IssueAuthTokenForTest(
       GaiaConstants::kSyncService, "sync_token");
   sync_->fail_initial_download();
 
   sync_->Initialize();
   EXPECT_FALSE(sync_->sync_initialized());
   EXPECT_FALSE(sync_->GetBackendForTest());
 }