This CL replaces user_manager::UserID with AccountId.

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

 // Copyright 2015 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.
 
 #include "chrome/browser/chromeos/login/signin/token_handle_fetcher.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "chrome/browser/chromeos/login/signin/token_handle_util.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 24 matching lines @@
     DependsOn(ProfileOAuth2TokenServiceFactory::GetInstance());
   }
   ~ShutdownNotifierFactory() override {}
 
   DISALLOW_COPY_AND_ASSIGN(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_)
     token_service_->RemoveObserver(this);
 }
 
 void TokenHandleFetcher::BackfillToken(Profile* profile,
                                        const TokenFetchingCallback& callback) {
   profile_ = profile;
   callback_ = callback;
@@ skipping 84 matching lines @@
   }
   const base::TimeDelta duration =
       base::TimeTicks::Now() - tokeninfo_response_start_time_;
   UMA_HISTOGRAM_TIMES("Login.TokenObtainResponseTime", duration);
   callback_.Run(user_id_, success);
 }
 
 void TokenHandleFetcher::OnProfileDestroyed() {
   callback_.Run(user_id_, false);
 }