Remove references to Profile from browser_context_keyed_service.

chrome/browser/policy/cloud/user_cloud_policy_manager_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/policy/cloud/user_cloud_policy_manager_factory.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "chrome/browser/policy/cloud/user_cloud_policy_manager.h"
 #include "chrome/browser/policy/cloud/user_cloud_policy_store.h"
@@ skipping 15 matching lines @@
 }
 
 // static
 scoped_ptr<UserCloudPolicyManager>
     UserCloudPolicyManagerFactory::CreateForProfile(Profile* profile,
                                                     bool force_immediate_load) {
   return GetInstance()->CreateManagerForProfile(profile, force_immediate_load);
 }
 
 UserCloudPolicyManagerFactory::UserCloudPolicyManagerFactory()
-    : ProfileKeyedBaseFactory("UserCloudPolicyManager",
-                              ProfileDependencyManager::GetInstance()) {}
+    : BrowserContextKeyedBaseFactory(
+        "UserCloudPolicyManager",
+        BrowserContextDependencyManager::GetInstance()) {}
 
 UserCloudPolicyManagerFactory::~UserCloudPolicyManagerFactory() {}
 
 UserCloudPolicyManager* UserCloudPolicyManagerFactory::GetManagerForProfile(
     Profile* profile) {
   // Get the manager for the original profile, since the PolicyService is
   // also shared between the incognito Profile and the original Profile.
   ManagerMap::const_iterator it = managers_.find(profile->GetOriginalProfile());
   return it != managers_.end() ? it->second : NULL;
 }
 
 scoped_ptr<UserCloudPolicyManager>
     UserCloudPolicyManagerFactory::CreateManagerForProfile(
         Profile* profile,
         bool force_immediate_load) {
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableCloudPolicyOnSignin)) {
     return scoped_ptr<UserCloudPolicyManager>();
   }
   scoped_ptr<UserCloudPolicyStore> store(UserCloudPolicyStore::Create(profile));
   if (force_immediate_load)
     store->LoadImmediately();
   scoped_ptr<UserCloudPolicyManager> manager(
       new UserCloudPolicyManager(profile, store.Pass()));
   manager->Init();
   return manager.Pass();
 }
 
-void UserCloudPolicyManagerFactory::ProfileShutdown(
+void UserCloudPolicyManagerFactory::BrowserContextShutdown(
     content::BrowserContext* context) {
   Profile* profile = static_cast<Profile*>(context);
   if (profile->IsOffTheRecord())
     return;
   UserCloudPolicyManager* manager = GetManagerForProfile(profile);
   if (manager) {
     manager->CloudPolicyManager::Shutdown();
-    manager->ProfileKeyedService::Shutdown();
+    manager->BrowserContextKeyedService::Shutdown();
   }
 }
 
 void UserCloudPolicyManagerFactory::SetEmptyTestingFactory(
     content::BrowserContext* profile) {
 }
 
 void UserCloudPolicyManagerFactory::CreateServiceNow(
     content::BrowserContext* profile) {
 }
@@ skipping 11 matching lines @@
   ManagerMap::iterator entry = managers_.find(profile);
   if (entry != managers_.end()) {
     DCHECK_EQ(instance, entry->second);
     managers_.erase(entry);
   } else {
     NOTREACHED();
   }
 }
 
 }  // namespace policy