This CL replaces user_manager::UserID with AccountId.

components/user_manager/user_info.h

Index: components/user_manager/user_info.h
diff --git a/components/user_manager/user_info.h b/components/user_manager/user_info.h
index cc613c188eb1b5ce25215e73532a99cbd51f95e0..52f379f85b68e7e48df4a8ac686f1ebb03cbb385 100644
--- a/components/user_manager/user_info.h
+++ b/components/user_manager/user_info.h
@@ -8,9 +8,10 @@
 #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;
 }
@@ -36,7 +37,7 @@ class USER_MANAGER_EXPORT UserInfo {
 
   // 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;