ConfigurationPolicyPrefStore refactoring to surface error messages.

chrome/browser/policy/browser_policy_connector.cc

 // Copyright (c) 2011 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/browser_policy_connector.h"
 
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "chrome/browser/net/gaia/token_service.h"
 #include "chrome/browser/policy/cloud_policy_data_store.h"
@@ skipping 58 matching lines @@
   device_cloud_policy_subsystem_.reset();
   device_data_store_.reset();
 #endif
 
   // Shutdown user cloud policy.
   if (user_cloud_policy_subsystem_.get())
     user_cloud_policy_subsystem_->Shutdown();
   user_cloud_policy_subsystem_.reset();
   user_policy_token_cache_.reset();
   user_data_store_.reset();
+
+  DeleteConfigurationPolicyHandlers(&policy_handlers_);
 }
 
 ConfigurationPolicyProvider*
     BrowserPolicyConnector::GetManagedPlatformProvider() const {
   return managed_platform_provider_.get();
 }
 
 ConfigurationPolicyProvider*
     BrowserPolicyConnector::GetManagedCloudProvider() const {
   return managed_cloud_provider_.get();
@@ skipping 169 matching lines @@
 #else
   return NULL;
 #endif
 }
 
 const CloudPolicyDataStore*
     BrowserPolicyConnector::GetUserCloudPolicyDataStore() const {
   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());
   recommended_platform_provider_.reset(CreateRecommendedPlatformProvider());
 
   managed_cloud_provider_.reset(new CloudPolicyProviderImpl(
       ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList(),
       CloudPolicyCacheBase::POLICY_LEVEL_MANDATORY));
   recommended_cloud_provider_.reset(new CloudPolicyProviderImpl(
       ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList(),
       CloudPolicyCacheBase::POLICY_LEVEL_RECOMMENDED));
 
 #if defined(OS_CHROMEOS)
   InitializeDevicePolicy();
 #endif
+  MakeConfigurationPolicyHandlers(&policy_handlers_);
 }
 
 BrowserPolicyConnector::BrowserPolicyConnector(
     ConfigurationPolicyProvider* managed_platform_provider,
     ConfigurationPolicyProvider* recommended_platform_provider,
     CloudPolicyProvider* managed_cloud_provider,
     CloudPolicyProvider* recommended_cloud_provider)
     : managed_platform_provider_(managed_platform_provider),
       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,
                                      const NotificationDetails& details) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (type == chrome::NOTIFICATION_TOKEN_AVAILABLE) {
     const TokenService* token_source =
         Source<const TokenService>(source).ptr();
     DCHECK_EQ(token_service_, token_source);
     const TokenService::TokenAvailableDetails* token_details =
@@ skipping 114 matching lines @@
         config_dir_path.Append(FILE_PATH_LITERAL("recommended")));
   } else {
     return new DummyConfigurationPolicyProvider(policy_list);
   }
 #else
   return new DummyConfigurationPolicyProvider(policy_list);
 #endif
 }
 
 }  // namespace