Revert of This CL replaces e-mail with AccountId on user selection screen.

chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.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_UI_WEBUI_CHROMEOS_LOGIN_SUPERVISED_USER_CREATION_SCREEN_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SUPERVISED_USER_CREATION_SCREEN_HANDLER_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 88 matching lines @@
       ::login::LocalizedValuesBuilder* builder) override;
   void Initialize() override;
 
   // WebUIMessageHandler implementation:
   void RegisterMessages() override;
 
  private:
   // WebUI message handlers.
   void HandleCheckSupervisedUserName(const base::string16& name);
 
-  void HandleManagerSelected(const AccountId& manager_id);
-  void HandleImportUserSelected(const AccountId& account_id);
+  void HandleManagerSelected(const std::string& manager_id);
+  void HandleImportUserSelected(const std::string& user_id);
 
   void HandleFinishLocalSupervisedUserCreation();
   void HandleAbortLocalSupervisedUserCreation();
   void HandleHideLocalSupervisedUserCreation();
   void HandleRetryLocalSupervisedUserCreation(const base::ListValue* args);
   void HandleCurrentSupervisedUserPage(const std::string& current_page);
 
-  void HandleAuthenticateManager(const AccountId& manager_account_id,
+  void HandleAuthenticateManager(const std::string& raw_manager_username,
                                  const std::string& manager_password);
   void HandleCreateSupervisedUser(const base::string16& new_raw_user_name,
                                const std::string& new_user_password);
-  void HandleImportSupervisedUser(const AccountId& account_id);
-  void HandleImportSupervisedUserWithPassword(const AccountId& account_id,
+  void HandleImportSupervisedUser(const std::string& user_id);
+  void HandleImportSupervisedUserWithPassword(const std::string& user_id,
                                               const std::string& password);
 
   void HandleGetImages();
   void HandlePhotoTaken(const std::string& image_url);
   void HandleTakePhoto();
   void HandleDiscardPhoto();
   void HandleSelectImage(const std::string& image_url,
                          const std::string& image_type);
 
   void UpdateText(const std::string& element_id, const base::string16& text);
 
   Delegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(SupervisedUserCreationScreenHandler);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SUPERVISED_USER_CREATION_SCREEN_HANDLER_H_