Index: chrome/browser/policy/browser_policy_connector.cc |
diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc |
index c32f4269976ec8d0ef113323f9989d007848780a..e577655e17c3a58b85f37ff4ae4689140c2df999 100644 |
--- a/chrome/browser/policy/browser_policy_connector.cc |
+++ b/chrome/browser/policy/browser_policy_connector.cc |
@@ -76,6 +76,8 @@ BrowserPolicyConnector::~BrowserPolicyConnector() { |
user_cloud_policy_subsystem_.reset(); |
user_policy_token_cache_.reset(); |
user_data_store_.reset(); |
+ |
+ DeleteConfigurationPolicyHandlers(&policy_handlers_); |
} |
ConfigurationPolicyProvider* |
@@ -265,6 +267,11 @@ const CloudPolicyDataStore* |
return user_data_store_.get(); |
} |
+const HandlerList* |
+ BrowserPolicyConnector::GetConfigurationPolicyHandlerList() const { |
+ return &policy_handlers_; |
+} |
+ |
BrowserPolicyConnector::BrowserPolicyConnector() |
: ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) { |
managed_platform_provider_.reset(CreateManagedPlatformProvider()); |
@@ -280,6 +287,7 @@ BrowserPolicyConnector::BrowserPolicyConnector() |
#if defined(OS_CHROMEOS) |
InitializeDevicePolicy(); |
#endif |
+ MakeConfigurationPolicyHandlers(&policy_handlers_); |
} |
BrowserPolicyConnector::BrowserPolicyConnector( |
@@ -291,7 +299,9 @@ BrowserPolicyConnector::BrowserPolicyConnector( |
recommended_platform_provider_(recommended_platform_provider), |
managed_cloud_provider_(managed_cloud_provider), |
recommended_cloud_provider_(recommended_cloud_provider), |
- ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {} |
+ ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) { |
+ MakeConfigurationPolicyHandlers(&policy_handlers_); |
+} |
void BrowserPolicyConnector::Observe(int type, |
const NotificationSource& source, |