Index: chrome/browser/profile_impl.h |
diff --git a/chrome/browser/profile_impl.h b/chrome/browser/profile_impl.h |
index b5fd6f8f16ee3ff8b6129cbb19d38669810e58f2..ea64bda26da0bc9c62565c5e19f167c57c172400 100644 |
--- a/chrome/browser/profile_impl.h |
+++ b/chrome/browser/profile_impl.h |
@@ -124,8 +124,7 @@ class ProfileImpl : public Profile, |
virtual ExtensionInfoMap* GetExtensionInfoMap(); |
virtual PromoCounter* GetInstantPromoCounter(); |
virtual BrowserSignin* GetBrowserSignin(); |
- virtual policy::DeviceManagementPolicyProvider* |
- GetDeviceManagementPolicyProvider(); |
+ virtual policy::ProfilePolicyContext* GetPolicyContext(); |
#if defined(OS_CHROMEOS) |
virtual chromeos::ProxyConfigServiceImpl* GetChromeOSProxyConfigServiceImpl(); |
@@ -180,6 +179,7 @@ class ProfileImpl : public Profile, |
transport_security_state_; |
scoped_refptr<TransportSecurityPersister> |
transport_security_persister_; |
+ scoped_ptr<policy::ProfilePolicyContext> profile_policy_context_; |
scoped_ptr<PrefService> prefs_; |
scoped_ptr<NetPrefObserver> net_pref_observer_; |
scoped_ptr<TemplateURLFetcher> template_url_fetcher_; |
@@ -273,9 +273,6 @@ class ProfileImpl : public Profile, |
scoped_refptr<ExtensionInfoMap> extension_info_map_; |
- scoped_ptr<policy::DeviceManagementPolicyProvider> |
- device_management_policy_provider_; |
- |
#if defined(OS_CHROMEOS) |
scoped_ptr<chromeos::Preferences> chromeos_preferences_; |