This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/login/signin/token_handle_fetcher.cc

Index: chrome/browser/chromeos/login/signin/token_handle_fetcher.cc
diff --git a/chrome/browser/chromeos/login/signin/token_handle_fetcher.cc b/chrome/browser/chromeos/login/signin/token_handle_fetcher.cc
index 3f79988b7d29ed7c08daa862fc33174f1beab686..88c56132ec3c51dba7ede951784948d4b769b28a 100644
--- a/chrome/browser/chromeos/login/signin/token_handle_fetcher.cc
+++ b/chrome/browser/chromeos/login/signin/token_handle_fetcher.cc
@@ -42,15 +42,14 @@ class ShutdownNotifierFactory
 }  // namespace
 
 TokenHandleFetcher::TokenHandleFetcher(TokenHandleUtil* util,
-                                       const user_manager::UserID& user_id)
+                                       const AccountId& user_id)

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

account_id

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

Done.

     : OAuth2TokenService::Consumer("user_session_manager"),
       token_handle_util_(util),
       user_id_(user_id),
       token_service_(nullptr),

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

You could move this initialization to the header file while you are here

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

Done.

       waiting_for_refresh_token_(false),
       profile_(nullptr),
-      tokeninfo_response_start_time_(base::TimeTicks()) {
-}
+      tokeninfo_response_start_time_(base::TimeTicks()) {}
 
 TokenHandleFetcher::~TokenHandleFetcher() {
   if (waiting_for_refresh_token_)