Move ManagedModePolicyProvider functionality to ManagedUserSettingsService.

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 0f5c90b6386a3f00afbfaaa9427fa5d30189caab..aa7e307419adb13c6751a7ae25c13d48ff74d54a 100644
--- a/chrome/browser/prefs/chrome_pref_service_factory.cc
+++ b/chrome/browser/prefs/chrome_pref_service_factory.cc
@@ -32,6 +32,10 @@
 #include "chrome/browser/policy/policy_types.h"
 #endif
 
+#if defined(ENABLE_MANAGED_USERS)
+#include "chrome/browser/managed_mode/supervised_user_pref_store.h"
+#endif
+
 using content::BrowserContext;
 using content::BrowserThread;
 
@@ -69,6 +73,7 @@ void PrepareBuilder(
     const base::FilePath& pref_filename,
     base::SequencedTaskRunner* pref_io_task_runner,
     policy::PolicyService* policy_service,
+    ManagedUserSettingsService* managed_user_settings,
     const scoped_refptr<PrefStore>& extension_prefs,
     bool async) {
 #if defined(OS_LINUX)
@@ -96,6 +101,13 @@ void PrepareBuilder(
       policy::POLICY_LEVEL_RECOMMENDED));
 #endif  // ENABLE_CONFIGURATION_POLICY
 
+#if defined(ENABLE_MANAGED_USERS)
+  if (managed_user_settings) {
+    builder->WithSupervisedUserPrefs(
+        new SupervisedUserPrefStore(managed_user_settings));
+  }
+#endif
+
   builder->WithAsync(async);
   builder->WithExtensionPrefs(extension_prefs.get());
   builder->WithCommandLinePrefs(
@@ -112,7 +124,6 @@ PrefService* CreateLocalState(
     const base::FilePath& pref_filename,
     base::SequencedTaskRunner* pref_io_task_runner,
     policy::PolicyService* policy_service,
-    const scoped_refptr<PrefStore>& extension_prefs,

[Pam (message me for reviews), 2013/09/09 15:13:49]

No extension prefs in local state anymore? Is this a related change?

[Bernhard Bauer, 2013/09/09 15:31:31]

Only related insofar as I was changing the signatures anyway. There never was an
extension PrefStore in Local State (extensions can only be installed per
profile), and I suspect this dates back from when they were both constructed in
the same way.

[Pam (message me for reviews), 2013/09/10 14:31:55]

Duh, makes sense.

     const scoped_refptr<PrefRegistry>& pref_registry,
     bool async) {
   PrefServiceSyncableBuilder builder;
@@ -120,7 +131,8 @@ PrefService* CreateLocalState(
                  pref_filename,
                  pref_io_task_runner,
                  policy_service,
-                 extension_prefs,
+                 NULL,
+                 NULL,
                  async);
   return builder.Create(pref_registry.get());
 }
@@ -129,6 +141,7 @@ PrefServiceSyncable* CreateProfilePrefs(
     const base::FilePath& pref_filename,
     base::SequencedTaskRunner* pref_io_task_runner,
     policy::PolicyService* policy_service,
+    ManagedUserSettingsService* managed_user_settings,
     const scoped_refptr<PrefStore>& extension_prefs,
     const scoped_refptr<user_prefs::PrefRegistrySyncable>& pref_registry,
     bool async) {
@@ -138,6 +151,7 @@ PrefServiceSyncable* CreateProfilePrefs(
                  pref_filename,
                  pref_io_task_runner,
                  policy_service,
+                 managed_user_settings,
                  extension_prefs,
                  async);
   return builder.CreateSyncable(pref_registry.get());