This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/login/signin/token_handle_util.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_util.h"
 
 #include "base/memory/weak_ptr.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile.h"
-#include "components/user_manager/user_id.h"
 #include "components/user_manager/user_manager.h"
 #include "google_apis/gaia/gaia_oauth_client.h"
 
 namespace {
 
 const char kTokenHandlePref[] = "PasswordTokenHandle";
 const char kTokenHandleStatusPref[] = "TokenHandleStatus";
 
 const char kHandleStatusValid[] = "valid";
 const char kHandleStatusInvalid[] = "invalid";
 const char* kDefaultHandleStatus = kHandleStatusValid;
 
 static const int kMaxRetries = 3;
 
 }  // namespace
 
 TokenHandleUtil::TokenHandleUtil(user_manager::UserManager* user_manager)
     : user_manager_(user_manager), weak_factory_(this) {
 }
 
 TokenHandleUtil::~TokenHandleUtil() {
   weak_factory_.InvalidateWeakPtrs();
   gaia_client_.reset();
 }
 
-bool TokenHandleUtil::HasToken(const user_manager::UserID& user_id) {
+bool TokenHandleUtil::HasToken(const AccountId& user_id) {

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

account_id here and below

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

Done.

   const base::DictionaryValue* dict = nullptr;
   std::string token;
   if (!user_manager_->FindKnownUserPrefs(user_id, &dict))
     return false;
   if (!dict->GetString(kTokenHandlePref, &token))
     return false;
   return !token.empty();
 }
 
-bool TokenHandleUtil::ShouldObtainHandle(const user_manager::UserID& user_id) {
+bool TokenHandleUtil::ShouldObtainHandle(const AccountId& user_id) {
   const base::DictionaryValue* dict = nullptr;
   std::string token;
   if (!user_manager_->FindKnownUserPrefs(user_id, &dict))
     return true;
   if (!dict->GetString(kTokenHandlePref, &token))
     return true;
   if (token.empty())
     return true;
   std::string status(kDefaultHandleStatus);
   dict->GetString(kTokenHandleStatusPref, &status);
   return kHandleStatusInvalid == status;
 }
 
-void TokenHandleUtil::DeleteHandle(const user_manager::UserID& user_id) {
+void TokenHandleUtil::DeleteHandle(const AccountId& user_id) {
   const base::DictionaryValue* dict = nullptr;
   if (!user_manager_->FindKnownUserPrefs(user_id, &dict))
     return;
   scoped_ptr<base::DictionaryValue> dict_copy(dict->DeepCopy());
   dict_copy->Remove(kTokenHandlePref, nullptr);
   dict_copy->Remove(kTokenHandleStatusPref, nullptr);
   user_manager_->UpdateKnownUserPrefs(user_id, *dict_copy.get(),
                                       /* replace values */ true);
 }
 
-void TokenHandleUtil::MarkHandleInvalid(const user_manager::UserID& user_id) {
+void TokenHandleUtil::MarkHandleInvalid(const AccountId& user_id) {
   user_manager_->SetKnownUserStringPref(user_id, kTokenHandleStatusPref,
                                         kHandleStatusInvalid);
 }
 
-void TokenHandleUtil::CheckToken(const user_manager::UserID& user_id,
+void TokenHandleUtil::CheckToken(const AccountId& user_id,
                                  const TokenValidationCallback& callback) {
   const base::DictionaryValue* dict = nullptr;
   std::string token;
   if (!user_manager_->FindKnownUserPrefs(user_id, &dict)) {
     callback.Run(user_id, UNKNOWN);
     return;
   }
   if (!dict->GetString(kTokenHandlePref, &token)) {
     callback.Run(user_id, UNKNOWN);
     return;
   }
 
   if (!gaia_client_.get()) {
     auto request_context =
         chromeos::ProfileHelper::Get()->GetSigninProfile()->GetRequestContext();
     gaia_client_.reset(new gaia::GaiaOAuthClient(request_context));
   }
 
   validation_delegates_.set(
       token, scoped_ptr<TokenDelegate>(new TokenDelegate(
                  weak_factory_.GetWeakPtr(), user_id, token, callback)));
   gaia_client_->GetTokenHandleInfo(token, kMaxRetries,
                                    validation_delegates_.get(token));
 }
 
-void TokenHandleUtil::StoreTokenHandle(const user_manager::UserID& user_id,
+void TokenHandleUtil::StoreTokenHandle(const AccountId& user_id,
                                        const std::string& handle) {
   user_manager_->SetKnownUserStringPref(user_id, kTokenHandlePref, handle);
   user_manager_->SetKnownUserStringPref(user_id, kTokenHandleStatusPref,
                                         kHandleStatusValid);
 }
 
 void TokenHandleUtil::OnValidationComplete(const std::string& token) {
   validation_delegates_.erase(token);
 }
 
-void TokenHandleUtil::OnObtainTokenComplete(
-    const user_manager::UserID& user_id) {
+void TokenHandleUtil::OnObtainTokenComplete(const AccountId& user_id) {
   obtain_delegates_.erase(user_id);
 }
 
 TokenHandleUtil::TokenDelegate::TokenDelegate(
     const base::WeakPtr<TokenHandleUtil>& owner,
-    const user_manager::UserID& user_id,
+    const AccountId& user_id,
     const std::string& token,
     const TokenValidationCallback& callback)
     : owner_(owner),
       user_id_(user_id),
       token_(token),
       tokeninfo_response_start_time_(base::TimeTicks::Now()),
-      callback_(callback) {
-}
+      callback_(callback) {}
 
 TokenHandleUtil::TokenDelegate::~TokenDelegate() {
 }
 
 void TokenHandleUtil::TokenDelegate::OnOAuthError() {
   callback_.Run(user_id_, INVALID);
   NotifyDone();
 }
 
 // Warning: NotifyDone() deletes |this|
@@ skipping 15 matching lines @@
     if (token_info->GetInteger("expires_in", &expires_in))
       outcome = (expires_in < 0) ? INVALID : VALID;
   }
 
   const base::TimeDelta duration =
       base::TimeTicks::Now() - tokeninfo_response_start_time_;
   UMA_HISTOGRAM_TIMES("Login.TokenCheckResponseTime", duration);
   callback_.Run(user_id_, outcome);
   NotifyDone();
 }