Introduced a ForwardingPolicyProvider.

chrome/browser/policy/browser_policy_connector.cc

 // Copyright (c) 2012 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 <algorithm>
 #include <iterator>
 
 #include "base/bind.h"
@@ skipping 369 matching lines @@
   global_user_cloud_policy_provider_.Shutdown();
 #endif
 
   device_management_service_.reset();
 
   request_context_ = NULL;
 }
 
 PolicyService* BrowserPolicyConnector::GetPolicyService() {
   if (!policy_service_) {
+    // |providers| in decreasing order of priority.
     std::vector<ConfigurationPolicyProvider*> providers;
+    if (g_testing_provider) {
+      providers.push_back(g_testing_provider);
+    } else {
+      if (platform_provider_)
+        providers.push_back(platform_provider_.get());
 #if defined(OS_CHROMEOS)
-    providers.push_back(&global_user_cloud_policy_provider_);
+      if (device_cloud_policy_manager_)
+        providers.push_back(device_cloud_policy_manager_.get());
+      providers.push_back(&global_user_cloud_policy_provider_);
 #endif
-    policy_service_ = CreatePolicyService(providers);
+    }
+    policy_service_.reset(new PolicyServiceImpl(providers));
   }
   return policy_service_.get();
 }
 
 const Schema& BrowserPolicyConnector::GetChromeSchema() const {
   return chrome_schema_;
 }
 
 CombinedSchemaRegistry* BrowserPolicyConnector::GetSchemaRegistry() {
   return &schema_registry_;
 }
 
+ConfigurationPolicyProvider* BrowserPolicyConnector::GetPlatformProvider() {
+  if (g_testing_provider)
+    return g_testing_provider;
+  return platform_provider_.get();
+}
+
 #if defined(OS_CHROMEOS)
 bool BrowserPolicyConnector::IsEnterpriseManaged() {
   return install_attributes_ && install_attributes_->IsEnterpriseDevice();
 }
 
 std::string BrowserPolicyConnector::GetEnterpriseDomain() {
   return install_attributes_ ? install_attributes_->GetDomain() : std::string();
 }
 
 DeviceMode BrowserPolicyConnector::GetDeviceMode() {
   return install_attributes_ ? install_attributes_->GetMode()
                              : DEVICE_MODE_NOT_SET;
 }
 #endif
 
 void BrowserPolicyConnector::ScheduleServiceInitialization(
     int64 delay_milliseconds) {
   // Skip device initialization if the BrowserPolicyConnector was never
   // initialized (unit tests).
   if (device_management_service_)
     device_management_service_->ScheduleInitialization(delay_milliseconds);
 }
 
-scoped_ptr<PolicyService> BrowserPolicyConnector::CreatePolicyService(
-    const std::vector<ConfigurationPolicyProvider*>& additional_providers) {
-  std::vector<ConfigurationPolicyProvider*> providers;
-  if (g_testing_provider) {
-    providers.push_back(g_testing_provider);
-  } else {
-    // |providers| in decreasing order of priority.
-    if (platform_provider_)
-      providers.push_back(platform_provider_.get());
-#if defined(OS_CHROMEOS)
-    if (device_cloud_policy_manager_)
-      providers.push_back(device_cloud_policy_manager_.get());
-#endif
-    std::copy(additional_providers.begin(), additional_providers.end(),
-              std::back_inserter(providers));
-  }
-  return scoped_ptr<PolicyService>(new PolicyServiceImpl(providers));
-}
-
 const ConfigurationPolicyHandlerList*
     BrowserPolicyConnector::GetHandlerList() const {
   return handler_list_.get();
 }
 
 UserAffiliation BrowserPolicyConnector::GetUserAffiliation(
     const std::string& user_name) {
 #if defined(OS_CHROMEOS)
   // An empty username means incognito user in case of ChromiumOS and
   // no logged-in user in case of Chromium (SigninService). Many tests use
@@ skipping 148 matching lines @@
     return new AsyncPolicyProvider(GetSchemaRegistry(), loader.Pass());
   } else {
     return NULL;
   }
 #else
   return NULL;
 #endif
 }
 
 }  // namespace policy