Introduced a ForwardingPolicyProvider.

chrome/browser/policy/profile_policy_connector_factory.cc

Index: chrome/browser/policy/profile_policy_connector_factory.cc
diff --git a/chrome/browser/policy/profile_policy_connector_factory.cc b/chrome/browser/policy/profile_policy_connector_factory.cc
index c5cb31bcb26cd2a9d98677f80a14c4c243142796..ccea9ca37d703228aad905826b3229574a0cab94 100644
--- a/chrome/browser/policy/profile_policy_connector_factory.cc
+++ b/chrome/browser/policy/profile_policy_connector_factory.cc
@@ -13,14 +13,14 @@
 #include "components/user_prefs/pref_registry_syncable.h"
 
 #if defined(ENABLE_CONFIGURATION_POLICY)
+#include "chrome/browser/policy/schema_registry_service.h"
+#include "chrome/browser/policy/schema_registry_service_factory.h"
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
-#include "chrome/browser/policy/schema_registry_service.h"
-#include "chrome/browser/policy/schema_registry_service_factory.h"
 #else
 #include "chrome/browser/policy/cloud/user_cloud_policy_manager.h"
 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
@@ -88,10 +88,12 @@ ProfilePolicyConnectorFactory::CreateForProfileInternal(
     Profile* profile,
     bool force_immediate_load) {
   DCHECK(connectors_.find(profile) == connectors_.end());
+
 #if defined(ENABLE_CONFIGURATION_POLICY)
-#if defined(OS_CHROMEOS)
   SchemaRegistry* schema_registry =
       SchemaRegistryServiceFactory::GetForContext(profile);
+
+#if defined(OS_CHROMEOS)
   chromeos::User* user = NULL;
   if (!chromeos::ProfileHelper::IsSigninProfile(profile)) {
     chromeos::UserManager* user_manager = chromeos::UserManager::Get();
@@ -104,15 +106,17 @@ ProfilePolicyConnectorFactory::CreateForProfileInternal(
   CloudPolicyManager* user_cloud_policy_manager =
       UserCloudPolicyManagerFactory::GetForBrowserContext(profile);
 #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.

+
 #else
   CloudPolicyManager* user_cloud_policy_manager = NULL;
 #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.

+
   ProfilePolicyConnector* connector = new ProfilePolicyConnector();
   connector->Init(force_immediate_load,
 #if defined(ENABLE_CONFIGURATION_POLICY) && defined(OS_CHROMEOS)
                   user,
-                  schema_registry,
 #endif
+                  schema_registry,
                   user_cloud_policy_manager);
   connectors_[profile] = connector;
   return make_scoped_ptr(connector);