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

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/managed/managed_user_creation_controller_old.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 25 matching lines @@
 namespace {
 
 const int kUserCreationTimeoutSeconds = 30;  // 30 seconds.
 
 bool StoreManagedUserFiles(const std::string& token,
                            const base::FilePath& base_path) {
   if (!base::SysInfo::IsRunningOnChromeOS()) {
     // If running on desktop, cryptohome stub does not create home directory.
     base::CreateDirectory(base_path);
   }
-  base::FilePath token_file = base_path.Append(kManagedUserTokenFilename);
+  base::FilePath token_file = base_path.Append(kSupervisedUserTokenFilename);
   int bytes = base::WriteFile(token_file, token.c_str(), token.length());
   return bytes >= 0;
 }
 
 }  // namespace
 
 ManagedUserCreationControllerOld::UserCreationContext::UserCreationContext()
     : avatar_index(kDummyAvatarIndex),
       token_acquired(false),
       token_succesfully_written(false),
@@ skipping 79 matching lines @@
       this,
       &ManagedUserCreationControllerOld::CreationTimedOut);
   SupervisedUserManager* manager =
       UserManager::Get()->GetSupervisedUserManager();
   manager->StartCreationTransaction(creation_context_->display_name);
 
   creation_context_->local_user_id = manager->GenerateUserId();
 
   if (creation_context_->creation_type == NEW_USER) {
     creation_context_->sync_user_id =
-        ManagedUserRegistrationUtility::GenerateNewManagedUserId();
+        SupervisedUserRegistrationUtility::GenerateNewSupervisedUserId();
   }
 
   manager->CreateUserRecord(creation_context_->manager_id,
                             creation_context_->local_user_id,
                             creation_context_->sync_user_id,
                             creation_context_->display_name);
 
   manager->SetCreationTransactionUserId(creation_context_->local_user_id);
   SupervisedUserAuthentication* authentication = manager->GetAuthentication();
   base::DictionaryValue extra;
@@ skipping 53 matching lines @@
   UserContext context(creation_context_->local_user_id);
   context.SetKey(Key(creation_context_->password));
   authenticator_->AddMasterKey(
       creation_context_->local_user_id,
       authentication->TransformKey(context).GetKey()->GetSecret(),
       creation_context_->master_key);
 }
 
 void ManagedUserCreationControllerOld::OnAddKeySuccess() {
   creation_context_->registration_utility =
-      ManagedUserRegistrationUtility::Create(
+      SupervisedUserRegistrationUtility::Create(
           creation_context_->manager_profile);
 
   VLOG(1) << "Creating user on server";
   // TODO(antrim) : add password data to sync once API is ready.
   // http://crbug.com/316168
-  ManagedUserRegistrationInfo info(creation_context_->display_name,
-                                   creation_context_->avatar_index);
+  SupervisedUserRegistrationInfo info(creation_context_->display_name,
+                                      creation_context_->avatar_index);
   info.master_key = creation_context_->master_key;
   timeout_timer_.Stop();
   creation_context_->registration_utility->Register(
       creation_context_->sync_user_id,
       info,
       base::Bind(&ManagedUserCreationControllerOld::RegistrationCallback,
                  weak_factory_.GetWeakPtr()));
 }
 
 void ManagedUserCreationControllerOld::RegistrationCallback(
@@ skipping 61 matching lines @@
   // Assume that new token is valid. It will be automatically invalidated if
   // sync service fails to use it.
   UserManager::Get()->SaveUserOAuthStatus(creation_context_->local_user_id,
                                           User::OAUTH2_TOKEN_STATUS_VALID);
   UserManager::Get()->GetSupervisedUserManager()->CommitCreationTransaction();
   if (consumer_)
     consumer_->OnCreationSuccess();
 }
 
 }  // namespace chromeos