Move ManagedModePolicyProvider functionality to ManagedUserSettingsService.

chrome/browser/sync/test/integration/single_client_managed_user_settings_sync_test.cc

Index: chrome/browser/sync/test/integration/single_client_managed_user_settings_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/single_client_managed_user_settings_sync_test.cc b/chrome/browser/sync/test/integration/single_client_managed_user_settings_sync_test.cc
index 460f346c3f6817bd43b0e44b547c9aac0e2d95cd..51b25fd7bc330a1a98d578b0b4d2b0b3db600a12 100644
--- a/chrome/browser/sync/test/integration/single_client_managed_user_settings_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_managed_user_settings_sync_test.cc
@@ -4,15 +4,14 @@
 
 #include "base/prefs/pref_service.h"
 #include "base/values.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/sync/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
-#include "policy/policy_constants.h"
 
 class SingleClientManagedUserSettingsSyncTest : public SyncTest {
  public:
@@ -21,7 +20,7 @@ class SingleClientManagedUserSettingsSyncTest : public SyncTest {
   virtual ~SingleClientManagedUserSettingsSyncTest() {}
 };
 
-// TODO(pavely): Fix this test.
+// TODO(pavely): Fix this test. See also: http://crbug.com/279307
 IN_PROC_BROWSER_TEST_F(SingleClientManagedUserSettingsSyncTest,
                        DISABLED_Sanity) {
   ASSERT_TRUE(SetupClients());
@@ -31,16 +30,14 @@ IN_PROC_BROWSER_TEST_F(SingleClientManagedUserSettingsSyncTest,
     // Managed users are prohibited from signing into the browser. Currently
     // that means they're also unable to sync anything, so override that for
     // this test.
-    // TODO(pamg): Remove this override (and the several #includes it requires)
-    // once sync and signin are properly separated for managed users. See
-    // http://crbug.com/239785.
-    policy::ProfilePolicyConnector* connector =
-        policy::ProfilePolicyConnectorFactory::GetForProfile(profile);
-    policy::ManagedModePolicyProvider* policy_provider =
-        connector->managed_mode_policy_provider();
+    // TODO(pamg): Remove this override (and the managed user setting it
+    // requires) once sync and signin are properly separated for managed users.
+    // See http://crbug.com/239785.
+    ManagedUserSettingsService* settings_service =
+        ManagedUserSettingsServiceFactory::GetForProfile(profile);
     scoped_ptr<base::Value> allow_signin(new base::FundamentalValue(true));
-    policy_provider->SetLocalPolicyForTesting(policy::key::kSigninAllowed,
-                                              allow_signin.Pass());
+    settings_service->SetLocalSettingForTesting(managed_users::kSigninAllowed,
+                                                allow_signin.Pass());
 
     // The user should not be signed in.
     std::string username;