This CL replaces user_manager::UserID with AccountId.

components/user_manager/user_info.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_INFO_H_
 #define COMPONENTS_USER_MANAGER_USER_INFO_H_
 
 #include <string>
 
 #include "base/strings/string16.h"
-#include "components/user_manager/user_id.h"
 #include "components/user_manager/user_manager_export.h"
 
+class AccountId;
+
 namespace gfx {
 class ImageSkia;
 }
 
 namespace user_manager {
 
 // A class that represents user related info.
 class USER_MANAGER_EXPORT UserInfo {
  public:
   UserInfo();
   virtual ~UserInfo();
 
   // Gets the display name for the user.
   virtual base::string16 GetDisplayName() const = 0;
 
   // Gets the given name of the user.
   virtual base::string16 GetGivenName() const = 0;
 
   // Gets the display email address for the user.
   // The display email address might contains some periods in the email name
   // as well as capitalized letters. For example: "Foo.Bar@mock.com".
   virtual std::string GetEmail() const = 0;
 
   // Gets the user id (sanitized email address) for the user.
   // The function would return something like "foobar@mock.com".
-  virtual UserID GetUserID() const = 0;
+  virtual AccountId GetUserID() const = 0;

[stevenjb, 2015/10/22 17:52:36]

I know it's a PITA, but I really wish we would rename this GetAccountId. This
change is already potentially confusing; having GetUserID return "AccountId" is
not going to help.

[achuithb, 2015/10/23 00:08:52]

+1

[Alexander Alekseev, 2015/10/23 09:11:24]

Done.

[Alexander Alekseev, 2015/10/23 09:11:24]

Done.

 
   // Gets the avatar image for the user.
   virtual const gfx::ImageSkia& GetImage() const = 0;
 };
 
 }  // namespace user_manager
 
 #endif  // COMPONENTS_USER_MANAGER_USER_INFO_H_