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

chrome/browser/chromeos/login/managed/managed_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_
 
 #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/managed_mode/managed_user_registration_utility.h"
+#include "chrome/browser/supervised_user/supervised_user_registration_utility.h"
 
 class Profile;
 
 namespace chromeos {
 
 class UserContext;
 
 // LMU Creation process:
 // 0. Manager is logged in
 // 1. Generate ID for new LMU
@@ skipping 106 matching lines @@
     std::string salted_master_key;  // Hash(system salt + master key)
     std::string mount_hash;
 
     std::string token;
 
     CreationType creation_type;
 
     base::DictionaryValue password_data;
 
     Profile* manager_profile;
-    scoped_ptr<ManagedUserRegistrationUtility> registration_utility;
+    scoped_ptr<SupervisedUserRegistrationUtility> registration_utility;
   };
 
   // ManagedUserAuthenticator::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();
-  // ManagedUserRegistrationUtility callback.
+  // SupervisedUserRegistrationUtility callback.
   void RegistrationCallback(const GoogleServiceAuthError& error,
                             const std::string& token);
 
   // Completion callback for StoreManagedUserFiles method.
   // Called on the UI thread.
   void OnManagedUserFilesStored(bool success);
 
   // Pointer to the current instance of the controller to be used by
   // automation tests.
   static ManagedUserCreationControllerNew* current_controller_;
@@ skipping 12 matching lines @@
 
   // Factory of callbacks.
   base::WeakPtrFactory<ManagedUserCreationControllerNew> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ManagedUserCreationControllerNew);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_MANAGED_MANAGED_USER_CREATION_CONTROLLER_NEW_H_