This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/login/session/user_session_manager.h

Index: chrome/browser/chromeos/login/session/user_session_manager.h
diff --git a/chrome/browser/chromeos/login/session/user_session_manager.h b/chrome/browser/chromeos/login/session/user_session_manager.h
index dee2273dc6aeb43664101d8e7e5f75b17a3e8abb..db8290c42aa3907057300a84df4aa96906dfc22c 100644
--- a/chrome/browser/chromeos/login/session/user_session_manager.h
+++ b/chrome/browser/chromeos/login/session/user_session_manager.h
@@ -24,6 +24,7 @@
 #include "net/base/network_change_notifier.h"
 #include "ui/base/ime/chromeos/input_method_manager.h"
 
+class AccountId;
 class GURL;
 class PrefRegistrySimple;
 class PrefService;
@@ -300,7 +301,7 @@ class UserSessionManager
   // Profile is created, extensions and promo resources are initialized.
   void UserProfileInitialized(Profile* profile,
                               bool is_incognito_profile,
-                              const std::string& user_id);
+                              const AccountId& user_id);

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

account_id

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

Done.

 
   // Callback to resume profile creation after transferring auth data from
   // the authentication profile.
@@ -368,7 +369,7 @@ class UserSessionManager
       const locale_util::LanguageSwitchResult& result);
 
   // Callback invoked when |token_handle_util_| has finished.
-  void OnTokenHandleObtained(const user_manager::UserID& id, bool success);
+  void OnTokenHandleObtained(const AccountId& id, bool success);

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

account_id

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

Done.

 
   // Returns |true| if token handles should be used on this device.
   bool TokenHandlesEnabled();