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

chrome/browser/chromeos/login/supervised/supervised_user_creation_controller_new.h

 // 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.
 
-#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_MANAGED_MANAGED_USER_CREATION_CONTROLLER_NEW_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_MANAGED_MANAGED_USER_CREATION_CONTROLLER_NEW_H_
+#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_CREATION_CONTROLLER_NEW_H_
+#define CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_CREATION_CONTROLLER_NEW_H_
 
 #include <string>
 
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "base/timer/timer.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/auth/extended_authenticator.h"
-#include "chrome/browser/chromeos/login/managed/managed_user_creation_controller.h"
+#include "chrome/browser/chromeos/login/supervised/supervised_user_creation_controller.h"
 #include "chrome/browser/supervised_user/supervised_user_registration_utility.h"
 
 class Profile;
 
 namespace chromeos {
 
 class UserContext;
 
-// LMU Creation process:
+// Supervised user creation process:
 // 0. Manager is logged in
-// 1. Generate ID for new LMU
+// 1. Generate ID for new supervised user
 // 2. Start "transaction" in Local State.
 // 3, Generate keys for user : master key, salt, encryption and signature keys.
 // 4. Create local cryptohome (errors could arise)
 // 5. Create user in cloud (errors could arise)
 // 6. Store cloud token in cryptohome (actually, error could arise).
 // 7. Mark "transaction" as completed.
 // 8. End manager session.
-class ManagedUserCreationControllerNew
-    : public ManagedUserCreationController,
+class SupervisedUserCreationControllerNew
+    : public SupervisedUserCreationController,
       public ExtendedAuthenticator::NewAuthStatusConsumer {
  public:
   // All UI initialization is deferred till Init() call.
   // |Consumer| is not owned by controller, and it is expected that it wouldn't
-  // be deleted before ManagedUserCreationControllerNew.
-  ManagedUserCreationControllerNew(StatusConsumer* consumer,
-                                   const std::string& manager_id);
-  virtual ~ManagedUserCreationControllerNew();
+  // be deleted before SupervisedUserCreationControllerNew.
+  SupervisedUserCreationControllerNew(StatusConsumer* consumer,
+                                      const std::string& manager_id);
+  virtual ~SupervisedUserCreationControllerNew();
 
-  // Returns the current locally managed user controller if it has been created.
-  static ManagedUserCreationControllerNew* current_controller() {
+  // Returns the current supervised user controller if it has been created.
+  static SupervisedUserCreationControllerNew* current_controller() {
     return current_controller_;
   }
 
   // Set up controller for creating new supervised user with |display_name|,
   // |password| and avatar indexed by |avatar_index|. StartCreation() have to
   // be called to actually start creating user.
   virtual void StartCreation(const base::string16& display_name,
                              const std::string& password,
                              int avatar_index) OVERRIDE;
 
@@ skipping 19 matching lines @@
                            const std::string& master_key,
                            const base::DictionaryValue* password_data,
                            const std::string& encryption_key,
                            const std::string& signature_key) OVERRIDE;
 
   virtual void SetManagerProfile(Profile* manager_profile) OVERRIDE;
   virtual Profile* GetManagerProfile() OVERRIDE;
 
   virtual void CancelCreation() OVERRIDE;
   virtual void FinishCreation() OVERRIDE;
-  virtual std::string GetManagedUserId() OVERRIDE;
+  virtual std::string GetSupervisedUserId() OVERRIDE;
 
  private:
   enum Stage {
     // Just initial stage.
     STAGE_INITIAL,
 
     // Creation attempt is recoreded to allow cleanup in case of failure.
     TRANSACTION_STARTED,
     // Different keys are generated and public ones are stored in LocalState.
     KEYS_GENERATED,
@@ skipping 39 matching lines @@
     std::string token;
 
     CreationType creation_type;
 
     base::DictionaryValue password_data;
 
     Profile* manager_profile;
     scoped_ptr<SupervisedUserRegistrationUtility> registration_utility;
   };
 
-  // ManagedUserAuthenticator::StatusConsumer overrides.
+  // SupervisedUserAuthenticator::StatusConsumer overrides.
   virtual void OnAuthenticationFailure(ExtendedAuthenticator::AuthState error)
       OVERRIDE;
 
   // Authenticator success callbacks.
   void OnMountSuccess(const std::string& mount_hash);
   void OnAddKeySuccess();
   void OnKeyTransformedIfNeeded(const UserContext& user_context);
 
   void StartCreationImpl();
 
   // Guard timer callback.
   void CreationTimedOut();
   // SupervisedUserRegistrationUtility callback.
   void RegistrationCallback(const GoogleServiceAuthError& error,
                             const std::string& token);
 
-  // Completion callback for StoreManagedUserFiles method.
+  // Completion callback for StoreSupervisedUserFiles method.
   // Called on the UI thread.
-  void OnManagedUserFilesStored(bool success);
+  void OnSupervisedUserFilesStored(bool success);
 
   // Pointer to the current instance of the controller to be used by
   // automation tests.
-  static ManagedUserCreationControllerNew* current_controller_;
+  static SupervisedUserCreationControllerNew* current_controller_;
 
   // Current stage of user creation.
   Stage stage_;
 
   // Authenticator used for user creation.
   scoped_refptr<ExtendedAuthenticator> authenticator_;
 
   // Creation context. Not null while creating new LMU.
   scoped_ptr<UserCreationContext> creation_context_;
 
   // Timer for showing warning if creation process takes too long.
-  base::OneShotTimer<ManagedUserCreationControllerNew> timeout_timer_;
+  base::OneShotTimer<SupervisedUserCreationControllerNew> timeout_timer_;
 
   // Factory of callbacks.
-  base::WeakPtrFactory<ManagedUserCreationControllerNew> weak_factory_;
+  base::WeakPtrFactory<SupervisedUserCreationControllerNew> weak_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(ManagedUserCreationControllerNew);
+  DISALLOW_COPY_AND_ASSIGN(SupervisedUserCreationControllerNew);
 };
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_MANAGED_MANAGED_USER_CREATION_CONTROLLER_NEW_H_
+#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_CREATION_CONTROLLER_NEW_H_