This CL replaces user_manager::UserID with AccountId.

chrome/browser/signin/chrome_signin_client.cc

 // Copyright 2014 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/signin/chrome_signin_client.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 46 matching lines @@
 #else
   // UserManager may not exist in unit_tests.
   if (!user_manager::UserManager::IsInitialized())
     return;
 
   const user_manager::User* user =
       chromeos::ProfileHelper::Get()->GetUserByProfile(profile_);
   if (!user)
     return;
   auto* user_manager = user_manager::UserManager::Get();
-  const std::string& user_id = user->GetUserID();
-  if (user_manager->GetKnownUserDeviceId(user_id).empty()) {
+  const AccountId account_id = user->GetAccountId();
+  if (user_manager->GetKnownUserDeviceId(account_id).empty()) {
     const std::string legacy_device_id =
         GetPrefs()->GetString(prefs::kGoogleServicesSigninScopedDeviceId);
     if (!legacy_device_id.empty()) {
       // Need to move device ID from the old location to the new one, if it has
       // not been done yet.
-      user_manager->SetKnownUserDeviceId(user_id, legacy_device_id);
+      user_manager->SetKnownUserDeviceId(account_id, legacy_device_id);
     } else {
       user_manager->SetKnownUserDeviceId(
-          user_id,
+          account_id,
           GenerateSigninScopedDeviceID(
-              user_manager->IsUserNonCryptohomeDataEphemeral(user_id)));
+              user_manager->IsUserNonCryptohomeDataEphemeral(account_id)));
     }
   }
   GetPrefs()->SetString(prefs::kGoogleServicesSigninScopedDeviceId,
                         std::string());
 #endif
 }
 
 ChromeSigninClient::~ChromeSigninClient() {
   signin_error_controller_->RemoveObserver(this);
 }
@@ skipping 57 matching lines @@
   // UserManager may not exist in unit_tests.
   if (!user_manager::UserManager::IsInitialized())
     return std::string();
 
   const user_manager::User* user =
       chromeos::ProfileHelper::Get()->GetUserByProfile(profile_);
   if (!user)
     return std::string();
 
   const std::string signin_scoped_device_id =
-      user_manager::UserManager::Get()->GetKnownUserDeviceId(user->GetUserID());
+      user_manager::UserManager::Get()->GetKnownUserDeviceId(
+          user->GetAccountId());
   LOG_IF(ERROR, signin_scoped_device_id.empty())
       << "Device ID is not set for user.";
   return signin_scoped_device_id;
 #endif
 }
 
 void ChromeSigninClient::OnSignedOut() {
   ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
   size_t index = cache.GetIndexOfProfileWithPath(profile_->GetPath());
@@ skipping 202 matching lines @@
         ProfileOAuth2TokenService* token_service =
             ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);
         OAuth2TokenService::ScopeSet scopes;
         scopes.insert(GaiaConstants::kGoogleUserInfoEmail);
         oauth_request_ = token_service->StartRequest(account_id, scopes, this);
       }
     }
   }
 #endif
 }