Refactored ConfigurationPolicyPrefStore to not depend on chrome/.

chrome/browser/prefs/chrome_pref_service_factory.cc

Index: chrome/browser/prefs/chrome_pref_service_factory.cc
diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc
index c28c479ea822fe2dbdd82b51a3eb8446de64b856..2e022095a98db55b7bde2a3bddf885bb48e804f4 100644
--- a/chrome/browser/prefs/chrome_pref_service_factory.cc
+++ b/chrome/browser/prefs/chrome_pref_service_factory.cc
@@ -15,6 +15,8 @@
 #include "base/prefs/pref_registry.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/pref_value_store.h"
+#include "chrome/browser/browser_process.h"
+#include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/configuration_policy_pref_store.h"
 #include "chrome/browser/prefs/command_line_pref_store.h"
 #include "chrome/browser/prefs/pref_model_associator.h"
@@ -75,12 +77,14 @@ void PrepareBuilder(
 
 #if defined(ENABLE_CONFIGURATION_POLICY)
   using policy::ConfigurationPolicyPrefStore;
-  builder->WithManagedPrefs(
-      ConfigurationPolicyPrefStore::CreateMandatoryPolicyPrefStore(
-          policy_service));
-  builder->WithRecommendedPrefs(
-      ConfigurationPolicyPrefStore::CreateRecommendedPolicyPrefStore(
-          policy_service));
+  builder->WithManagedPrefs(new ConfigurationPolicyPrefStore(
+      policy_service,
+      g_browser_process->browser_policy_connector()->GetHandlerList(),
+      policy::POLICY_LEVEL_MANDATORY));

[bartfab (slow), 2013/08/12 13:27:53]

Nit: #include "chrome/browser/policy/policy_types.h"

[Joao da Silva, 2013/08/12 15:41:55]

Done.

+  builder->WithRecommendedPrefs(new ConfigurationPolicyPrefStore(
+      policy_service,
+      g_browser_process->browser_policy_connector()->GetHandlerList(),
+      policy::POLICY_LEVEL_RECOMMENDED));
 #endif  // ENABLE_CONFIGURATION_POLICY
 
   builder->WithAsync(async);