Move ManagedModePolicyProvider functionality to ManagedUserSettingsService.

chrome/browser/managed_mode/managed_user_service_browsertest.cc

Index: chrome/browser/managed_mode/managed_user_service_browsertest.cc
diff --git a/chrome/browser/managed_mode/managed_user_service_browsertest.cc b/chrome/browser/managed_mode/managed_user_service_browsertest.cc
index b83247fc98badd239c8b37df3b74e93848b63564..9af82f642f45274331405230836c81b1b00e751f 100644
--- a/chrome/browser/managed_mode/managed_user_service_browsertest.cc
+++ b/chrome/browser/managed_mode/managed_user_service_browsertest.cc
@@ -5,11 +5,11 @@
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/managed_mode/managed_user_constants.h"
 #include "chrome/browser/managed_mode/managed_user_service.h"
 #include "chrome/browser/managed_mode/managed_user_service_factory.h"
-#include "chrome/browser/policy/managed_mode_policy_provider.h"
-#include "chrome/browser/policy/profile_policy_connector.h"
-#include "chrome/browser/policy/profile_policy_connector_factory.h"
+#include "chrome/browser/managed_mode/managed_user_settings_service.h"
+#include "chrome/browser/managed_mode/managed_user_settings_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ -17,7 +17,6 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "content/public/test/test_utils.h"
-#include "policy/policy_constants.h"
 
 typedef InProcessBrowserTest ManagedUserServiceTest;
 
@@ -25,21 +24,20 @@ IN_PROC_BROWSER_TEST_F(ManagedUserServiceTest, LocalPolicies) {
   Profile* profile = browser()->profile();
   PrefService* prefs = profile->GetPrefs();
   EXPECT_FALSE(prefs->GetBoolean(prefs::kForceSafeSearch));
-  EXPECT_FALSE(prefs->IsManagedPreference(prefs::kForceSafeSearch));
+  EXPECT_TRUE(prefs->IsUserModifiablePreference(prefs::kForceSafeSearch));
 
   ManagedUserService* managed_user_service =
        ManagedUserServiceFactory::GetForProfile(profile);
   managed_user_service->InitForTesting();
-  content::RunAllPendingInMessageLoop();
 
   EXPECT_TRUE(prefs->GetBoolean(prefs::kForceSafeSearch));
-  EXPECT_TRUE(prefs->IsManagedPreference(prefs::kForceSafeSearch));
+  EXPECT_FALSE(prefs->IsUserModifiablePreference(prefs::kForceSafeSearch));
 }
 
 IN_PROC_BROWSER_TEST_F(ManagedUserServiceTest, ProfileName) {
   Profile* profile = browser()->profile();
   PrefService* prefs = profile->GetPrefs();
-  EXPECT_FALSE(prefs->IsManagedPreference(prefs::kProfileName));
+  EXPECT_TRUE(prefs->IsUserModifiablePreference(prefs::kProfileName));
 
   std::string original_name = prefs->GetString(prefs::kProfileName);
   ProfileManager* profile_manager = g_browser_process->profile_manager();
@@ -52,36 +50,31 @@ IN_PROC_BROWSER_TEST_F(ManagedUserServiceTest, ProfileName) {
   ManagedUserService* managed_user_service =
       ManagedUserServiceFactory::GetForProfile(profile);
   managed_user_service->InitForTesting();
-  policy::ProfilePolicyConnector* connector =
-      policy::ProfilePolicyConnectorFactory::GetForProfile(profile);
-  policy::ManagedModePolicyProvider* provider =
-      connector->managed_mode_policy_provider();
+  ManagedUserSettingsService* settings =
+      ManagedUserSettingsServiceFactory::GetForProfile(profile);
 
   std::string name = "Managed User Test Name";
-  provider->SetLocalPolicyForTesting(
-      policy::key::kUserDisplayName,
+  settings->SetLocalSettingForTesting(
+      managed_users::kUserName,
       scoped_ptr<base::Value>(new base::StringValue(name)));
-  content::RunAllPendingInMessageLoop();
-  EXPECT_TRUE(prefs->IsManagedPreference(prefs::kProfileName));
+  EXPECT_FALSE(prefs->IsUserModifiablePreference(prefs::kProfileName));
   EXPECT_EQ(name, prefs->GetString(prefs::kProfileName));
   profile_index = cache.GetIndexOfProfileWithPath(profile->GetPath());
   EXPECT_EQ(name, UTF16ToUTF8(cache.GetNameOfProfileAtIndex(profile_index)));
 
   // Change the name once more.
   std::string new_name = "New Managed User Test Name";
-  provider->SetLocalPolicyForTesting(
-      policy::key::kUserDisplayName,
+  settings->SetLocalSettingForTesting(
+      managed_users::kUserName,
       scoped_ptr<base::Value>(new base::StringValue(new_name)));
-  content::RunAllPendingInMessageLoop();;
   EXPECT_EQ(new_name, prefs->GetString(prefs::kProfileName));
   profile_index = cache.GetIndexOfProfileWithPath(profile->GetPath());
   EXPECT_EQ(new_name,
             UTF16ToUTF8(cache.GetNameOfProfileAtIndex(profile_index)));
 
-  // Remove the policy.
-  provider->SetLocalPolicyForTesting(policy::key::kUserDisplayName,
-                                     scoped_ptr<base::Value>());
-  content::RunAllPendingInMessageLoop();
+  // Remove the setting.
+  settings->SetLocalSettingForTesting(managed_users::kUserName,
+                                      scoped_ptr<base::Value>());
   EXPECT_EQ(original_name, prefs->GetString(prefs::kProfileName));
   profile_index = cache.GetIndexOfProfileWithPath(profile->GetPath());
   EXPECT_EQ(original_name,