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

chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc

Index: chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc
diff --git a/chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc b/chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc
index 1d341e8ff7b727089e089b564c6d20014faee7cb..525dbf8161656aaef42d2b84c0b9e50294880823 100644
--- a/chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc
+++ b/chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc
@@ -22,11 +22,11 @@
 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h"
 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
-#include "chrome/browser/managed_mode/managed_user_constants.h"
-#include "chrome/browser/managed_mode/managed_user_shared_settings_service.h"
-#include "chrome/browser/managed_mode/managed_user_shared_settings_service_factory.h"
-#include "chrome/browser/managed_mode/managed_user_sync_service.h"
-#include "chrome/browser/managed_mode/managed_user_sync_service_factory.h"
+#include "chrome/browser/supervised_user/supervised_user_constants.h"
+#include "chrome/browser/supervised_user/supervised_user_shared_settings_service.h"
+#include "chrome/browser/supervised_user/supervised_user_shared_settings_service_factory.h"
+#include "chrome/browser/supervised_user/supervised_user_sync_service.h"
+#include "chrome/browser/supervised_user/supervised_user_sync_service_factory.h"
 #include "chromeos/network/network_state.h"
 #include "content/public/browser/browser_thread.h"
 #include "grit/generated_resources.h"
@@ -239,13 +239,13 @@ void LocallyManagedUserCreationScreen::ImportManagedUser(
   std::string avatar;
   bool exists;
   int avatar_index = ManagedUserCreationController::kDummyAvatarIndex;
-  user_info->GetString(ManagedUserSyncService::kName, &display_name);
-  user_info->GetString(ManagedUserSyncService::kMasterKey, &master_key);
-  user_info->GetString(ManagedUserSyncService::kPasswordSignatureKey,
+  user_info->GetString(SupervisedUserSyncService::kName, &display_name);
+  user_info->GetString(SupervisedUserSyncService::kMasterKey, &master_key);
+  user_info->GetString(SupervisedUserSyncService::kPasswordSignatureKey,
                        &signature_key);
-  user_info->GetString(ManagedUserSyncService::kPasswordEncryptionKey,
+  user_info->GetString(SupervisedUserSyncService::kPasswordEncryptionKey,
                        &encryption_key);
-  user_info->GetString(ManagedUserSyncService::kChromeOsAvatar, &avatar);
+  user_info->GetString(SupervisedUserSyncService::kChromeOsAvatar, &avatar);
   user_info->GetBoolean(kUserExists, &exists);
 
   // We should not get here with existing user selected, so just display error.
@@ -260,14 +260,14 @@ void LocallyManagedUserCreationScreen::ImportManagedUser(
     return;
   }
 
-  ManagedUserSyncService::GetAvatarIndex(avatar, &avatar_index);
+  SupervisedUserSyncService::GetAvatarIndex(avatar, &avatar_index);
 
   const base::DictionaryValue* password_data = NULL;
-  ManagedUserSharedSettingsService* shared_settings_service =
-      ManagedUserSharedSettingsServiceFactory::GetForBrowserContext(
+  SupervisedUserSharedSettingsService* shared_settings_service =
+      SupervisedUserSharedSettingsServiceFactory::GetForBrowserContext(
           controller_->GetManagerProfile());
   const base::Value* value = shared_settings_service->GetValue(
-      user_id, managed_users::kChromeOSPasswordData);
+      user_id, supervised_users::kChromeOSPasswordData);
 
   bool password_right_here = value && value->GetAsDictionary(&password_data) &&
                              !password_data->empty();
@@ -303,9 +303,9 @@ void LocallyManagedUserCreationScreen::ImportManagedUserWithPassword(
   std::string avatar;
   bool exists;
   int avatar_index = ManagedUserCreationController::kDummyAvatarIndex;
-  user_info->GetString(ManagedUserSyncService::kName, &display_name);
-  user_info->GetString(ManagedUserSyncService::kMasterKey, &master_key);
-  user_info->GetString(ManagedUserSyncService::kChromeOsAvatar, &avatar);
+  user_info->GetString(SupervisedUserSyncService::kName, &display_name);
+  user_info->GetString(SupervisedUserSyncService::kMasterKey, &master_key);
+  user_info->GetString(SupervisedUserSyncService::kChromeOsAvatar, &avatar);
   user_info->GetBoolean(kUserExists, &exists);
 
   // We should not get here with existing user selected, so just display error.
@@ -320,7 +320,7 @@ void LocallyManagedUserCreationScreen::ImportManagedUserWithPassword(
     return;
   }
 
-  ManagedUserSyncService::GetAvatarIndex(avatar, &avatar_index);
+  SupervisedUserSyncService::GetAvatarIndex(avatar, &avatar_index);
 
   controller_->StartImport(display_name,
                            password,
@@ -348,14 +348,15 @@ void LocallyManagedUserCreationScreen::OnManagerFullyAuthenticated(
 
   last_page_ = kNameOfNewUserParametersScreen;
   CHECK(!sync_service_);
-  sync_service_ = ManagedUserSyncServiceFactory::GetForProfile(manager_profile);
+  sync_service_ = SupervisedUserSyncServiceFactory::GetForProfile(
+      manager_profile);
   sync_service_->AddObserver(this);
-  OnManagedUsersChanged();
+  OnSupervisedUsersChanged();
 }
 
-void LocallyManagedUserCreationScreen::OnManagedUsersChanged() {
+void LocallyManagedUserCreationScreen::OnSupervisedUsersChanged() {
   CHECK(sync_service_);
-  sync_service_->GetManagedUsersAsync(
+  sync_service_->GetSupervisedUsersAsync(
       base::Bind(&LocallyManagedUserCreationScreen::OnGetManagedUsers,
                  weak_factory_.GetWeakPtr()));
 }
@@ -431,7 +432,7 @@ bool LocallyManagedUserCreationScreen::FindUserByDisplayName(
     const base::DictionaryValue* user_info =
         static_cast<const base::DictionaryValue*>(&it.value());
     base::string16 user_display_name;
-    if (user_info->GetString(ManagedUserSyncService::kName,
+    if (user_info->GetString(SupervisedUserSyncService::kName,
                              &user_display_name)) {
       if (display_name == user_display_name) {
         if (out_id)
@@ -502,17 +503,17 @@ void LocallyManagedUserCreationScreen::OnGetManagedUsers(
 
     int avatar_index = ManagedUserCreationController::kDummyAvatarIndex;
     std::string chromeos_avatar;
-    if (local_copy->GetString(ManagedUserSyncService::kChromeOsAvatar,
+    if (local_copy->GetString(SupervisedUserSyncService::kChromeOsAvatar,
                               &chromeos_avatar) &&
         !chromeos_avatar.empty() &&
-        ManagedUserSyncService::GetAvatarIndex(
+        SupervisedUserSyncService::GetAvatarIndex(
             chromeos_avatar, &avatar_index)) {
       ui_copy->SetString(kAvatarURLKey, GetDefaultImageUrl(avatar_index));
     } else {
       int i = base::RandInt(kFirstDefaultImageIndex, kDefaultImagesCount - 1);
       local_copy->SetString(
-          ManagedUserSyncService::kChromeOsAvatar,
-          ManagedUserSyncService::BuildAvatarString(i));
+          SupervisedUserSyncService::kChromeOsAvatar,
+          SupervisedUserSyncService::BuildAvatarString(i));
       local_copy->SetBoolean(kRandomAvatarKey, true);
       ui_copy->SetString(kAvatarURLKey, GetDefaultImageUrl(i));
     }
@@ -521,7 +522,7 @@ void LocallyManagedUserCreationScreen::OnGetManagedUsers(
     ui_copy->SetBoolean(kUserExists, false);
 
     base::string16 display_name;
-    local_copy->GetString(ManagedUserSyncService::kName, &display_name);
+    local_copy->GetString(SupervisedUserSyncService::kName, &display_name);
 
     if (supervised_user_manager->FindBySyncId(it.key())) {
       local_copy->SetBoolean(kUserExists, true);
@@ -534,11 +535,11 @@ void LocallyManagedUserCreationScreen::OnGetManagedUsers(
       local_copy->SetString(kUserConflict, kUserConflictName);
       ui_copy->SetString(kUserConflict, kUserConflictName);
     }
-    ui_copy->SetString(ManagedUserSyncService::kName, display_name);
+    ui_copy->SetString(SupervisedUserSyncService::kName, display_name);
 
     std::string signature_key;
     bool has_password =
-        local_copy->GetString(ManagedUserSyncService::kPasswordSignatureKey,
+        local_copy->GetString(SupervisedUserSyncService::kPasswordSignatureKey,
                               &signature_key) &&
         !signature_key.empty();