Move UserInfo to user_manager.

chrome/browser/chromeos/login/users/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 CHROME_BROWSER_CHROMEOS_LOGIN_USERS_USER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_USER_H_
 
 #include <string>
 #include <vector>
 
-#include "ash/session/user_info.h"
 #include "base/basictypes.h"
 #include "base/strings/string16.h"
 #include "components/user_manager/user_image/user_image.h"
+#include "components/user_manager/user_info.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 {
 
 extern const int kDefaultImagesCount;
 
 // A class representing information about a previously logged in user.
 // Each user has a canonical email (username), returned by |email()| and
 // may have a different displayed email (in the raw form as entered by user),
 // returned by |displayed_email()|.
 // Displayed emails are for use in UI only, anywhere else users must be referred
 // to by |email()|.
-class User : public ash::UserInfo {
+class User : public user_manager::UserInfo {
  public:
   // User OAuth token status according to the last check.
   // Please note that enum values 1 and 2 were used for OAuth1 status and are
   // deprecated now.
   typedef enum {
      OAUTH_TOKEN_STATUS_UNKNOWN  = 0,
      OAUTH2_TOKEN_STATUS_INVALID = 3,
      OAUTH2_TOKEN_STATUS_VALID   = 4,
   } OAuthTokenStatus;
 
@@ skipping 16 matching lines @@
 
   // Returns the user type.
   virtual user_manager::UserType GetType() const = 0;
 
   // The email the user used to log in.
   const std::string& email() const { return email_; }
 
   // The displayed user name.
   base::string16 display_name() const { return display_name_; }
 
-  // ash::UserInfo
+  // user_manager::UserInfo
   virtual std::string GetEmail() const OVERRIDE;
   virtual base::string16 GetDisplayName() const OVERRIDE;
   virtual base::string16 GetGivenName() const OVERRIDE;
   virtual const gfx::ImageSkia& GetImage() const OVERRIDE;
   virtual std::string GetUserID() const OVERRIDE;
 
   // Returns the account name part of the email. Use the display form of the
   // email if available and use_display_name == true. Otherwise use canonical.
   std::string GetAccountName(bool use_display_email) const;
 
@@ skipping 183 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(User);
 };
 
 // List of known users.
 typedef std::vector<User*> UserList;
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_USER_H_