Remove references to Profile from browser_context_keyed_service.

chrome/browser/password_manager/password_store_factory.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 "chrome/browser/password_manager/password_store_factory.h"
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/password_manager/login_database.h"
@@ skipping 36 matching lines @@
 
 scoped_refptr<PasswordStore> PasswordStoreFactory::GetForProfile(
     Profile* profile,
     Profile::ServiceAccessType sat) {
   if (sat == Profile::IMPLICIT_ACCESS && profile->IsOffTheRecord()) {
     NOTREACHED() << "This profile is OffTheRecord";
     return NULL;
   }
 
   return static_cast<PasswordStore*>(
-      GetInstance()->GetServiceForProfile(profile, true).get());
+      GetInstance()->GetServiceForBrowserContext(profile, true).get());
 }
 
 // static
 PasswordStoreFactory* PasswordStoreFactory::GetInstance() {
   return Singleton<PasswordStoreFactory>::get();
 }
 
 PasswordStoreFactory::PasswordStoreFactory()
-    : RefcountedProfileKeyedServiceFactory(
+    : RefcountedBrowserContextKeyedServiceFactory(
         "PasswordStore",
-        ProfileDependencyManager::GetInstance()) {
+        BrowserContextDependencyManager::GetInstance()) {
   DependsOn(WebDataServiceFactory::GetInstance());
 }
 
 PasswordStoreFactory::~PasswordStoreFactory() {}
 
 #if !defined(OS_CHROMEOS) && defined(USE_X11)
 LocalProfileId PasswordStoreFactory::GetLocalProfileId(
     PrefService* prefs) const {
   LocalProfileId id = prefs->GetInteger(prefs::kLocalProfileId);
   if (id == kInvalidLocalProfileId) {
     // Note that there are many more users than this. Thus, by design, this is
     // not a unique id. However, it is large enough that it is very unlikely
     // that it would be repeated twice on a single machine. It is still possible
     // for that to occur though, so the potential results of it actually
     // happening should be considered when using this value.
     static const LocalProfileId kLocalProfileIdMask =
         static_cast<LocalProfileId>((1 << 24) - 1);
     do {
       id = rand() & kLocalProfileIdMask;
       // TODO(mdm): scan other profiles to make sure they are not using this id?
     } while (id == kInvalidLocalProfileId);
     prefs->SetInteger(prefs::kLocalProfileId, id);
   }
   return id;
 }
 #endif
 
-scoped_refptr<RefcountedProfileKeyedService>
+scoped_refptr<RefcountedBrowserContextKeyedService>
 PasswordStoreFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
   Profile* profile = static_cast<Profile*>(context);
 
   scoped_refptr<PasswordStore> ps;
   base::FilePath login_db_file_path = profile->GetPath();
   login_db_file_path = login_db_file_path.Append(chrome::kLoginDataFileName);
   LoginDatabase* login_db = new LoginDatabase();
   {
     // TODO(paivanof@gmail.com): execution of login_db->Init() should go
@@ skipping 103 matching lines @@
 }
 
 content::BrowserContext* PasswordStoreFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return chrome::GetBrowserContextRedirectedInIncognito(context);
 }
 
 bool PasswordStoreFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }