| Index: chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc
|
| diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc
|
| index 603c558d386ce868542879890578229541a760bd..0cb76ccdebc3105c0be8a5d6d0d958dc745f2676 100644
|
| --- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc
|
| +++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc
|
| @@ -66,8 +66,9 @@ scoped_ptr<UserCloudPolicyManagerChromeOS>
|
| }
|
|
|
| UserCloudPolicyManagerFactoryChromeOS::UserCloudPolicyManagerFactoryChromeOS()
|
| - : ProfileKeyedBaseFactory("UserCloudPolicyManagerChromeOS",
|
| - ProfileDependencyManager::GetInstance()) {}
|
| + : BrowserContextKeyedBaseFactory(
|
| + "UserCloudPolicyManagerChromeOS",
|
| + BrowserContextDependencyManager::GetInstance()) {}
|
|
|
| UserCloudPolicyManagerFactoryChromeOS::
|
| ~UserCloudPolicyManagerFactoryChromeOS() {}
|
| @@ -156,7 +157,7 @@ scoped_ptr<UserCloudPolicyManagerChromeOS>
|
| return manager.Pass();
|
| }
|
|
|
| -void UserCloudPolicyManagerFactoryChromeOS::ProfileShutdown(
|
| +void UserCloudPolicyManagerFactoryChromeOS::BrowserContextShutdown(
|
| content::BrowserContext* context) {
|
| Profile* profile = static_cast<Profile*>(context);
|
| if (profile->IsOffTheRecord())
|
| @@ -166,11 +167,11 @@ void UserCloudPolicyManagerFactoryChromeOS::ProfileShutdown(
|
| manager->Shutdown();
|
| }
|
|
|
| -void UserCloudPolicyManagerFactoryChromeOS::ProfileDestroyed(
|
| +void UserCloudPolicyManagerFactoryChromeOS::BrowserContextDestroyed(
|
| content::BrowserContext* context) {
|
| Profile* profile = static_cast<Profile*>(context);
|
| managers_.erase(profile);
|
| - ProfileKeyedBaseFactory::ProfileDestroyed(context);
|
| + BrowserContextKeyedBaseFactory::BrowserContextDestroyed(context);
|
| }
|
|
|
| void UserCloudPolicyManagerFactoryChromeOS::SetEmptyTestingFactory(
|
|
|