Move ManagedModePolicyProvider functionality to ManagedUserSettingsService.

chrome/browser/profiles/profile_impl.cc

Index: chrome/browser/profiles/profile_impl.cc
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index d66a66f625c9aa9fd5789ee292faf64b63bd0758..a6790dfc754d0b7d096e59ad1835b45f441c2884 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -97,6 +97,21 @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
+#if defined(ENABLE_CONFIGURATION_POLICY)
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
+#include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h"
+#else
+#include "chrome/browser/policy/cloud/user_cloud_policy_manager.h"
+#include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
+#endif
+#endif
+
+#if defined(ENABLE_MANAGED_USERS)
+#include "chrome/browser/managed_mode/managed_user_settings_service.h"
+#include "chrome/browser/managed_mode/managed_user_settings_service_factory.h"
+#endif
+
 #if defined(OS_WIN)
 #include "chrome/installer/util/install_util.h"
 #endif
@@ -109,16 +124,6 @@
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #endif
 
-#if defined(ENABLE_CONFIGURATION_POLICY)
-#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
-#include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h"
-#else
-#include "chrome/browser/policy/cloud/user_cloud_policy_manager.h"
-#include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
-#endif
-#endif
-
 using base::Time;
 using base::TimeDelta;
 using content::BrowserThread;
@@ -407,7 +412,15 @@ ProfileImpl::ProfileImpl(
     chrome::RegisterLoginProfilePrefs(pref_registry_.get());
   else
 #endif
-    chrome::RegisterUserProfilePrefs(pref_registry_.get());
+  chrome::RegisterUserProfilePrefs(pref_registry_.get());
+
+  ManagedUserSettingsService* managed_user_settings = NULL;
+#if defined(ENABLE_MANAGED_USERS)
+  managed_user_settings =
+      ManagedUserSettingsServiceFactory::GetForProfile(this);

[Elliot Glaysher, 2013/09/10 21:25:10]

Is any progress being made on separating out PrefService so it could depend on
things like this?

[Bernhard Bauer, 2013/09/11 08:10:34]

Hm... Mattias, do you know what's missing?

[Mattias Nissler (ping if slow), 2013/09/11 08:17:05]

I've been chatting about this every now and then with Joao. What needs to happen
mostly is initializing PrefService as a BrowserContextKeyedService, and making
all consuming services declare their dependency properly.

[Bernhard Bauer, 2013/09/11 08:20:40]

Ok... Do we also need to deal with things like extension prefs (which need to be
loaded from Preferences before we can... initialize Preferences)?

[Joao da Silva, 2013/09/11 08:25:00]

Yep. It's hard to do it because PrefService waits asynchronously for the
JsonPrefStore to be ready, but BCKSs can't be created asynchronously yet. It's
also not clear what the impact of that async initialization would be on startup
time, when the first Profile is loaded synchronously (because we can't show UI
until we have the prefs ready).

[Bernhard Bauer, 2013/09/11 08:50:47]

Erik Wright is working on an asynchronous DI framework that could help with
that:
https://docs.google.com/a/chromium.org/document/d/1slbNnVtq6ZelEOr-2G0R9iXcaa...
Assuming that we use some sort of asynchronous dependency injection,
initialization should be the same, except that we block until prefs have been
loaded the first time, no?

+  managed_user_settings->Init(
+      path_, sequenced_task_runner, create_mode == CREATE_MODE_SYNCHRONOUS);
+#endif
 
   {
     // On startup, preference loading is always synchronous so a scoped timer
@@ -418,6 +431,7 @@ ProfileImpl::ProfileImpl(
         GetPrefFilePath(),
         sequenced_task_runner,
         profile_policy_connector_->policy_service(),
+        managed_user_settings,
         new ExtensionPrefStore(
             ExtensionPrefValueMapFactory::GetForProfile(this), false),
         pref_registry_,