Move ManagedModePolicyProvider functionality to ManagedUserSettingsService.

chrome/browser/prefs/chrome_pref_service_factory.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/prefs/chrome_pref_service_factory.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
@@ skipping 14 matching lines @@
 #include "content/public/browser/browser_thread.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 
 #if defined(ENABLE_CONFIGURATION_POLICY)
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/configuration_policy_pref_store.h"
 #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;
 
 namespace {
 
 // Shows notifications which correspond to PersistentPrefStore's reading errors.
 void HandleReadError(PersistentPrefStore::PrefReadError error) {
   if (error != PersistentPrefStore::PREF_READ_ERROR_NONE) {
 #if !defined(OS_CHROMEOS)
     // Failing to load prefs on startup is a bad thing(TM). See bug 38352 for
@@ skipping 17 matching lines @@
     UMA_HISTOGRAM_ENUMERATION("PrefService.ReadError", error,
                               PersistentPrefStore::PREF_READ_ERROR_MAX_ENUM);
   }
 }
 
 void PrepareBuilder(
     PrefServiceSyncableBuilder* builder,
     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)
   // We'd like to see what fraction of our users have the preferences
   // stored on a network file system, as we've had no end of troubles
   // with NFS/AFS.
   // TODO(evanm): remove this once we've collected state.
   file_util::FileSystemType fstype;
   if (file_util::GetFileSystemType(pref_filename.DirName(), &fstype)) {
     UMA_HISTOGRAM_ENUMERATION("PrefService.FileSystemType",
                               static_cast<int>(fstype),
                               file_util::FILE_SYSTEM_TYPE_COUNT);
   }
 #endif
 
 #if defined(ENABLE_CONFIGURATION_POLICY)
   using policy::ConfigurationPolicyPrefStore;
   builder->WithManagedPrefs(new ConfigurationPolicyPrefStore(
       policy_service,
       g_browser_process->browser_policy_connector()->GetHandlerList(),
       policy::POLICY_LEVEL_MANDATORY));
   builder->WithRecommendedPrefs(new ConfigurationPolicyPrefStore(
       policy_service,
       g_browser_process->browser_policy_connector()->GetHandlerList(),
       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(
       new CommandLinePrefStore(CommandLine::ForCurrentProcess()));
   builder->WithReadErrorCallback(base::Bind(&HandleReadError));
   builder->WithUserPrefs(new JsonPrefStore(pref_filename, pref_io_task_runner));
 }
 
 }  // namespace
 
 namespace chrome_prefs {
 
 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;
   PrepareBuilder(&builder,
                  pref_filename,
                  pref_io_task_runner,
                  policy_service,
-                 extension_prefs,
+                 NULL,
+                 NULL,
                  async);
   return builder.Create(pref_registry.get());
 }
 
 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) {
   TRACE_EVENT0("browser", "chrome_prefs::CreateProfilePrefs");
   PrefServiceSyncableBuilder builder;
   PrepareBuilder(&builder,
                  pref_filename,
                  pref_io_task_runner,
                  policy_service,
+                 managed_user_settings,
                  extension_prefs,
                  async);
   return builder.CreateSyncable(pref_registry.get());
 }
 
 }  // namespace chrome_prefs