Refactored ConfigurationPolicyPrefStore to not depend on chrome/.

chrome/browser/prefs/pref_service_syncable_builder.cc

Index: chrome/browser/prefs/pref_service_syncable_builder.cc
diff --git a/chrome/browser/prefs/pref_service_syncable_builder.cc b/chrome/browser/prefs/pref_service_syncable_builder.cc
index 69a090c559660b9e0aa4fe7a61173cbc7bd44c06..d917a514c941899de2a1dca14b6b3aa293c4cc32 100644
--- a/chrome/browser/prefs/pref_service_syncable_builder.cc
+++ b/chrome/browser/prefs/pref_service_syncable_builder.cc
@@ -8,6 +8,8 @@
 #include "base/prefs/default_pref_store.h"
 #include "base/prefs/pref_notifier_impl.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/policy/policy_service.h"
 #include "chrome/browser/prefs/command_line_pref_store.h"
@@ -24,14 +26,18 @@ PrefServiceSyncableBuilder::~PrefServiceSyncableBuilder() {
 PrefServiceSyncableBuilder& PrefServiceSyncableBuilder::WithManagedPolicies(
     policy::PolicyService* service) {
   WithManagedPrefs(new policy::ConfigurationPolicyPrefStore(
-      service, policy::POLICY_LEVEL_MANDATORY));
+      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.

   return *this;
 }
 
 PrefServiceSyncableBuilder& PrefServiceSyncableBuilder::WithRecommendedPolicies(
     policy::PolicyService* service) {
   WithRecommendedPrefs(new policy::ConfigurationPolicyPrefStore(
-      service, policy::POLICY_LEVEL_RECOMMENDED));
+      service,
+      g_browser_process->browser_policy_connector()->GetHandlerList(),
+      policy::POLICY_LEVEL_RECOMMENDED));
   return *this;
 }
 #endif