Introduced a ForwardingPolicyProvider.

chrome/browser/policy/browser_policy_connector.h

Index: chrome/browser/policy/browser_policy_connector.h
diff --git a/chrome/browser/policy/browser_policy_connector.h b/chrome/browser/policy/browser_policy_connector.h
index 4fa0581ed7fb6f815475235b1f3a964db44a9d43..6f79136cf9752874292753724a583bbe506a3d2c 100644
--- a/chrome/browser/policy/browser_policy_connector.h
+++ b/chrome/browser/policy/browser_policy_connector.h
@@ -6,7 +6,6 @@
 #define CHROME_BROWSER_POLICY_BROWSER_POLICY_CONNECTOR_H_
 
 #include <string>
-#include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
@@ -76,6 +75,9 @@ class BrowserPolicyConnector {
   // providers also load policies for the components of each Profile.
   CombinedSchemaRegistry* GetSchemaRegistry();
 
+  // Returns the platform policy provider.
+  ConfigurationPolicyProvider* GetPlatformProvider();
+
   // Returns the browser-global PolicyService, that contains policies for the
   // whole browser.
   PolicyService* GetPolicyService();
@@ -99,14 +101,6 @@ class BrowserPolicyConnector {
   // services are already constructed.
   void ScheduleServiceInitialization(int64 delay_milliseconds);
 
-  // Creates a new PolicyService that gets its policies from the global policy
-  // providers owned by the BrowserPolicyConnector and the optional
-  // |additional_providers|, which will have lower priority.
-  // The lifetime of the returned PolicyService is tied to the lifetime of
-  // the BrowserPolicyConnector.
-  scoped_ptr<PolicyService> CreatePolicyService(
-      const std::vector<ConfigurationPolicyProvider*>& additional_providers);
-
   const ConfigurationPolicyHandlerList* GetHandlerList() const;
 
   // Works out the user affiliation by checking the given |user_name| against