Introduced a ForwardingPolicyProvider.

chrome/browser/policy/profile_policy_connector.h

Index: chrome/browser/policy/profile_policy_connector.h
diff --git a/chrome/browser/policy/profile_policy_connector.h b/chrome/browser/policy/profile_policy_connector.h
index 0b5b014c405a24a669ee15366b19ee3ea33bc0f7..8b33f195dbc3eede6337a76b46c81d9b6a6c8bee 100644
--- a/chrome/browser/policy/profile_policy_connector.h
+++ b/chrome/browser/policy/profile_policy_connector.h
@@ -33,8 +33,8 @@ class ProfilePolicyConnector : public BrowserContextKeyedService {
   void Init(bool force_immediate_load,
 #if defined(OS_CHROMEOS)
             const chromeos::User* user,
-            SchemaRegistry* schema_registry,
 #endif
+            SchemaRegistry* schema_registry,
             CloudPolicyManager* user_cloud_policy_manager);
 
   void InitForTesting(scoped_ptr<PolicyService> service);
@@ -46,7 +46,8 @@ class ProfilePolicyConnector : public BrowserContextKeyedService {
   PolicyService* policy_service() const { return policy_service_.get(); }
 
  private:
-#if defined(ENABLE_CONFIGURATION_POLICY) && defined(OS_CHROMEOS)
+#if defined(ENABLE_CONFIGURATION_POLICY)
+#if defined(OS_CHROMEOS)
   void InitializeDeviceLocalAccountPolicyProvider(
       const std::string& username,
       SchemaRegistry* schema_registry);
@@ -61,6 +62,9 @@ class ProfilePolicyConnector : public BrowserContextKeyedService {
   scoped_ptr<ConfigurationPolicyProvider> special_user_policy_provider_;
 #endif

[bartfab (slow), 2013/11/13 18:23:35]

Nit: Add // defined(OS_CHROMEOS) to make it clearer which #if is ending here.

[Joao da Silva, 2013/11/14 08:23:42]

Done.

 
+  scoped_ptr<ConfigurationPolicyProvider> forwarding_policy_provider_;
+#endif

[bartfab (slow), 2013/11/13 18:23:35]

Nit: Add // defined(ENABLE_CONFIGURATION_POLICY) to make it clearer which #if is
ending here.

[Joao da Silva, 2013/11/14 08:23:42]

Done.

+
   scoped_ptr<PolicyService> policy_service_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfilePolicyConnector);