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 699a0d13c08185b99bd714235791ccce7cf396c1..67e8d6fe19489ef3f5b8fa305baf3fc24039a977 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;
 
@@ -72,6 +76,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)
@@ -99,6 +104,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(
@@ -115,7 +127,6 @@ PrefService* CreateLocalState(
     const base::FilePath& pref_filename,
     base::SequencedTaskRunner* pref_io_task_runner,
     policy::PolicyService* policy_service,
-    const scoped_refptr<PrefStore>& extension_prefs,
     const scoped_refptr<PrefRegistry>& pref_registry,
     bool async) {
   PrefServiceSyncableBuilder builder;
@@ -123,7 +134,8 @@ PrefService* CreateLocalState(
                  pref_filename,
                  pref_io_task_runner,
                  policy_service,
-                 extension_prefs,
+                 NULL,
+                 NULL,
                  async);
   return builder.Create(pref_registry.get());
 }
@@ -132,6 +144,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) {
@@ -141,6 +154,7 @@ PrefServiceSyncable* CreateProfilePrefs(
                  pref_filename,
                  pref_io_task_runner,
                  policy_service,
+                 managed_user_settings,
                  extension_prefs,
                  async);
   return builder.CreateSyncable(pref_registry.get());