Remove dependency of PrefSyncableService on Profile.

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 5bd3623f22bb1650e03f8d41eb8a91cc3e6af3bf..12f3d369f4dc1172662eed5b6c2d14eb81820384 100644
--- a/chrome/browser/prefs/chrome_pref_service_factory.cc
+++ b/chrome/browser/prefs/chrome_pref_service_factory.cc
@@ -25,6 +25,7 @@
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/prefs/chrome_pref_model_associator_client.h"
 #include "chrome/browser/prefs/command_line_pref_store.h"
 #include "chrome/browser/prefs/pref_model_associator.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
@@ -54,7 +55,6 @@
 #if defined(ENABLE_CONFIGURATION_POLICY)
 #include "components/policy/core/browser/browser_policy_connector.h"
 #include "components/policy/core/browser/configuration_policy_pref_store.h"
-#include "components/policy/core/common/policy_types.h"
 #endif
 
 #if defined(ENABLE_EXTENSIONS)
@@ -427,17 +427,10 @@ void PrepareFactory(
     const scoped_refptr<PrefStore>& extension_prefs,
     bool async) {
 #if defined(ENABLE_CONFIGURATION_POLICY)
-  using policy::ConfigurationPolicyPrefStore;
-  factory->set_managed_prefs(
-      make_scoped_refptr(new ConfigurationPolicyPrefStore(
-          policy_service,
-          g_browser_process->browser_policy_connector()->GetHandlerList(),
-          policy::POLICY_LEVEL_MANDATORY)));
-  factory->set_recommended_prefs(
-      make_scoped_refptr(new ConfigurationPolicyPrefStore(
-          policy_service,
-          g_browser_process->browser_policy_connector()->GetHandlerList(),
-          policy::POLICY_LEVEL_RECOMMENDED)));
+  policy::BrowserPolicyConnector* policy_connector =
+      g_browser_process->browser_policy_connector();
+  factory->SetManagedPolicies(policy_service, policy_connector);
+  factory->SetRecommendedPolicies(policy_service, policy_connector);
 #endif  // ENABLE_CONFIGURATION_POLICY
 
 #if defined(ENABLE_SUPERVISED_USERS)
@@ -451,6 +444,9 @@ void PrepareFactory(
   }
 #endif
 
+  factory->SetPrefModelAssociatorClient(
+      ChromePrefModelAssociatorClient::GetInstance());
+
   factory->set_async(async);
   factory->set_extension_prefs(extension_prefs);
   factory->set_command_line_prefs(make_scoped_refptr(