Rename "managed (mode|user)" to "supervised user" (part 2)

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 6fad88b957760cc471a7b57efde9535599c9460b..5ac3cd0b7932b6cd811cf64b172c09e8fdcab168 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
@@ -5,21 +5,21 @@
 #include "base/command_line.h"
 #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/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/supervised_user/supervised_user_constants.h"
+#include "chrome/browser/supervised_user/supervised_user_service.h"
+#include "chrome/browser/supervised_user/supervised_user_service_factory.h"
+#include "chrome/browser/supervised_user/supervised_user_settings_service.h"
+#include "chrome/browser/supervised_user/supervised_user_settings_service_factory.h"
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "chrome/common/chrome_switches.h"
 
-class SingleClientManagedUserSettingsSyncTest : public SyncTest {
+class SingleClientSupervisedUserSettingsSyncTest : public SyncTest {
  public:
-  SingleClientManagedUserSettingsSyncTest() : SyncTest(SINGLE_CLIENT) {}
+  SingleClientSupervisedUserSettingsSyncTest() : SyncTest(SINGLE_CLIENT) {}
 
-  virtual ~SingleClientManagedUserSettingsSyncTest() {}
+  virtual ~SingleClientSupervisedUserSettingsSyncTest() {}
 
   // SyncTest overrides:
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
@@ -28,21 +28,23 @@ class SingleClientManagedUserSettingsSyncTest : public SyncTest {
   }
 };
 
-IN_PROC_BROWSER_TEST_F(SingleClientManagedUserSettingsSyncTest, Sanity) {
+IN_PROC_BROWSER_TEST_F(SingleClientSupervisedUserSettingsSyncTest, Sanity) {
   ASSERT_TRUE(SetupClients());
   for (int i = 0; i < num_clients(); ++i) {
     Profile* profile = GetProfile(i);
-    // Managed users are prohibited from signing into the browser. Currently
+    // Supervised 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 managed user setting it
-    // requires) once sync and signin are properly separated for managed users.
+    // TODO(pamg): Remove this override (and the supervised user setting it
+    // requires) once sync and signin are properly separated for supervised
+    // users.
     // See http://crbug.com/239785.
-    ManagedUserSettingsService* settings_service =
-        ManagedUserSettingsServiceFactory::GetForProfile(profile);
+    SupervisedUserSettingsService* settings_service =
+        SupervisedUserSettingsServiceFactory::GetForProfile(profile);
     scoped_ptr<base::Value> allow_signin(new base::FundamentalValue(true));
-    settings_service->SetLocalSettingForTesting(managed_users::kSigninAllowed,
-                                                allow_signin.Pass());
+    settings_service->SetLocalSettingForTesting(
+        supervised_users::kSigninAllowed,
+        allow_signin.Pass());
 
     // The user should not be signed in.
     std::string username;