| Index: chrome/browser/policy/profile_policy_connector_factory.cc
|
| diff --git a/chrome/browser/policy/profile_policy_connector_factory.cc b/chrome/browser/policy/profile_policy_connector_factory.cc
|
| index ad609b5ae3b5b64d938d04c96bcfeb21592b136c..09c0453e09b8f14976484e295ff6dc740a9f0471 100644
|
| --- a/chrome/browser/policy/profile_policy_connector_factory.cc
|
| +++ b/chrome/browser/policy/profile_policy_connector_factory.cc
|
| @@ -52,8 +52,8 @@ void ProfilePolicyConnectorFactory::SetServiceForTesting(
|
| }
|
|
|
| ProfilePolicyConnectorFactory::ProfilePolicyConnectorFactory()
|
| - : ProfileKeyedBaseFactory("ProfilePolicyConnector",
|
| - ProfileDependencyManager::GetInstance()) {
|
| + : BrowserContextKeyedBaseFactory("ProfilePolicyConnector",
|
| + BrowserContextDependencyManager::GetInstance()) {
|
| #if defined(ENABLE_CONFIGURATION_POLICY)
|
| #if defined(OS_CHROMEOS)
|
| DependsOn(UserCloudPolicyManagerFactoryChromeOS::GetInstance());
|
| @@ -89,7 +89,7 @@ scoped_ptr<ProfilePolicyConnector>
|
| return scoped_ptr<ProfilePolicyConnector>(connector);
|
| }
|
|
|
| -void ProfilePolicyConnectorFactory::ProfileShutdown(
|
| +void ProfilePolicyConnectorFactory::BrowserContextShutdown(
|
| content::BrowserContext* context) {
|
| Profile* profile = static_cast<Profile*>(context);
|
| if (profile->IsOffTheRecord())
|
| @@ -99,12 +99,12 @@ void ProfilePolicyConnectorFactory::ProfileShutdown(
|
| it->second->Shutdown();
|
| }
|
|
|
| -void ProfilePolicyConnectorFactory::ProfileDestroyed(
|
| +void ProfilePolicyConnectorFactory::BrowserContextDestroyed(
|
| content::BrowserContext* context) {
|
| ConnectorMap::iterator it = connectors_.find(static_cast<Profile*>(context));
|
| if (it != connectors_.end())
|
| connectors_.erase(it);
|
| - ProfileKeyedBaseFactory::ProfileDestroyed(context);
|
| + BrowserContextKeyedBaseFactory::BrowserContextDestroyed(context);
|
| }
|
|
|
| void ProfilePolicyConnectorFactory::RegisterUserPrefs(
|
|
|