Revert of This CL replaces user_manager::UserID with AccountId.

components/user_manager/user.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 COMPONENTS_USER_MANAGER_USER_H_
 #define COMPONENTS_USER_MANAGER_USER_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/strings/string16.h"
-#include "components/signin/core/account_id/account_id.h"
+#include "components/user_manager/user_id.h"
 #include "components/user_manager/user_image/user_image.h"
 #include "components/user_manager/user_info.h"
 #include "components/user_manager/user_manager_export.h"
 #include "components/user_manager/user_type.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace chromeos {
 class ChromeUserManagerImpl;
 class FakeChromeUserManager;
@@ skipping 52 matching lines @@
     WALLPAPER_TYPE_COUNT = 6
   };
 
   // Returns true if user type has gaia account.
   static bool TypeHasGaiaAccount(UserType user_type);
 
   // Returns the user type.
   virtual UserType GetType() const = 0;
 
   // The email the user used to log in.
-  // TODO(alemate): rename this to GetUserEmail() (see crbug.com/548923)
-  const std::string& email() const;
+  const std::string& email() const { return email_; }
 
   // The displayed user name.
   base::string16 display_name() const { return display_name_; }
 
   // If the user has to use SAML to log in.
   bool using_saml() const { return using_saml_; }
 
   // UserInfo
   std::string GetEmail() const override;
   base::string16 GetDisplayName() const override;
   base::string16 GetGivenName() const override;
   const gfx::ImageSkia& GetImage() const override;
-  AccountId GetAccountId() const override;
+  UserID GetUserID() const override;
 
   // Allows managing child status of the user. Used for RegularUser.
   virtual void SetIsChild(bool is_child);
 
   // Returns true if user has gaia account. True for users of types
   // USER_TYPE_REGULAR and USER_TYPE_CHILD.
   virtual bool HasGaiaAccount() const;
 
   // Returns true if user is supervised.
   virtual bool IsSupervised() const;
@@ skipping 65 matching lines @@
   friend class chromeos::UserImageManagerImpl;
   friend class chromeos::UserSessionManager;
 
   // For testing:
   friend class FakeUserManager;
   friend class chromeos::FakeChromeUserManager;
   friend class chromeos::MockUserManager;
   friend class chromeos::UserAddingScreenTest;
 
   // Do not allow anyone else to create new User instances.
-  static User* CreateRegularUser(const AccountId& account_id);
+  static User* CreateRegularUser(const UserID& email);
   static User* CreateGuestUser();
-  static User* CreateKioskAppUser(const AccountId& kiosk_app_account_id);
-  static User* CreateSupervisedUser(const AccountId& account_id);
-  static User* CreatePublicAccountUser(const AccountId& account_id);
+  static User* CreateKioskAppUser(const UserID& kiosk_app_username);
+  static User* CreateSupervisedUser(const UserID& username);
+  static User* CreatePublicAccountUser(const UserID& email);
 
-  explicit User(const AccountId& account_id);
+  explicit User(const std::string& email);
   ~User() override;
 
   const std::string* GetAccountLocale() const { return account_locale_.get(); }
 
   // Setters are private so only UserManager can call them.
   void SetAccountLocale(const std::string& resolved_account_locale);
 
   void SetImage(const UserImage& user_image, int image_index);
 
   void SetImageURL(const GURL& image_url);
@@ skipping 42 matching lines @@
   void set_profile_is_created() { profile_is_created_ = true; }
 
   // True if user has google account (not a guest or managed user).
   bool has_gaia_account() const;
 
   void set_affiliation(bool is_affiliated) {
     is_affiliated_ = is_affiliated;
   }
 
  private:
-  AccountId account_id_;
+  std::string email_;
   base::string16 display_name_;
   base::string16 given_name_;
   // The displayed user email, defaults to |email_|.
   std::string display_email_;
-  bool using_saml_ = false;
+  bool using_saml_;
   UserImage user_image_;
-  OAuthTokenStatus oauth_token_status_ = OAUTH_TOKEN_STATUS_UNKNOWN;
-  bool force_online_signin_ = false;
+  OAuthTokenStatus oauth_token_status_;
+  bool force_online_signin_;
 
   // This is set to chromeos locale if account data has been downloaded.
   // (Or failed to download, but at least one download attempt finished).
   // An empty string indicates error in data load, or in
   // translation of Account locale to chromeos locale.
   scoped_ptr<std::string> account_locale_;
 
   // Used to identify homedir mount point.
   std::string username_hash_;
 
   // Either index of a default image for the user, |USER_IMAGE_EXTERNAL| or
   // |USER_IMAGE_PROFILE|.
-  int image_index_ = USER_IMAGE_INVALID;
+  int image_index_;
 
   // True if current user image is a stub set by a |SetStubImage| call.
-  bool image_is_stub_ = false;
+  bool image_is_stub_;
 
   // True if current user image is being loaded from file.
-  bool image_is_loading_ = false;
+  bool image_is_loading_;
 
   // True if user is able to lock screen.
-  bool can_lock_ = false;
+  bool can_lock_;
 
   // True if user is currently logged in in current session.
-  bool is_logged_in_ = false;
+  bool is_logged_in_;
 
   // True if user is currently logged in and active in current session.
-  bool is_active_ = false;
+  bool is_active_;
 
   // True if user Profile is created
-  bool profile_is_created_ = false;
+  bool profile_is_created_;
 
   // True if the user is affiliated to the device.
-  bool is_affiliated_ = false;
+  bool is_affiliated_;
 
   DISALLOW_COPY_AND_ASSIGN(User);
 };
 
 // List of known users.
-using UserList = std::vector<User*>;
+typedef std::vector<User*> UserList;
 
 }  // namespace user_manager
 
 #endif  // COMPONENTS_USER_MANAGER_USER_H_