This CL replaces user_manager::UserID with AccountId.

chromeos/login/auth/extended_authenticator_impl.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 "chromeos/login/auth/extended_authenticator_impl.h"
 
 #include "base/bind.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "chromeos/cryptohome/async_method_caller.h"
 #include "chromeos/cryptohome/cryptohome_parameters.h"
 #include "chromeos/cryptohome/homedir_methods.h"
 #include "chromeos/cryptohome/system_salt_getter.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/login/auth/auth_status_consumer.h"
 #include "chromeos/login/auth/key.h"
 #include "chromeos/login/auth/user_context.h"
 #include "chromeos/login_event_recorder.h"
+#include "components/signin/core/account_id/account_id.h"
 #include "crypto/sha2.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 
 namespace chromeos {
 
 namespace {
 
 void RecordStartMarker(const std::string& marker) {
   std::string full_marker = "Cryptohome-";
   full_marker.append(marker);
@@ skipping 54 matching lines @@
     const ResultCallback& success_callback) {
   RecordStartMarker("MountEx");
 
   std::string canonicalized = gaia::CanonicalizeEmail(user_id);
   cryptohome::Identification id(canonicalized);
   cryptohome::Authorization auth(keys.front());
   cryptohome::MountParameters mount(false);
   for (size_t i = 0; i < keys.size(); i++) {
     mount.create_keys.push_back(keys[i]);
   }
-  UserContext context(user_id);
+  UserContext context(AccountId::FromUserEmail(user_id));
   Key key(keys.front().secret);
   key.SetLabel(keys.front().label);
   context.SetKey(key);
 
   cryptohome::HomedirMethods::GetInstance()->MountEx(
       id,
       auth,
       mount,
       base::Bind(&ExtendedAuthenticatorImpl::OnMountComplete,
                  this,
@@ skipping 74 matching lines @@
     it->Run();
   }
   system_salt_callbacks_.clear();
 }
 
 void ExtendedAuthenticatorImpl::DoAuthenticateToMount(
     const ResultCallback& success_callback,
     const UserContext& user_context) {
   RecordStartMarker("MountEx");
 
-  std::string canonicalized = gaia::CanonicalizeEmail(user_context.GetUserID());
+  const std::string canonicalized =
+      gaia::CanonicalizeEmail(user_context.GetAccountId().GetUserEmail());
   cryptohome::Identification id(canonicalized);
   const Key* const key = user_context.GetKey();
   cryptohome::Authorization auth(key->GetSecret(), key->GetLabel());
   cryptohome::MountParameters mount(false);
 
   cryptohome::HomedirMethods::GetInstance()->MountEx(
       id,
       auth,
       mount,
       base::Bind(&ExtendedAuthenticatorImpl::OnMountComplete,
                  this,
                  "MountEx",
                  user_context,
                  success_callback));
 }
 
 void ExtendedAuthenticatorImpl::DoAuthenticateToCheck(
     const base::Closure& success_callback,
     const UserContext& user_context) {
   RecordStartMarker("CheckKeyEx");
 
-  std::string canonicalized = gaia::CanonicalizeEmail(user_context.GetUserID());
+  const std::string canonicalized =
+      gaia::CanonicalizeEmail(user_context.GetAccountId().GetUserEmail());
   cryptohome::Identification id(canonicalized);
   const Key* const key = user_context.GetKey();
   cryptohome::Authorization auth(key->GetSecret(), key->GetLabel());
 
   cryptohome::HomedirMethods::GetInstance()->CheckKeyEx(
       id,
       auth,
       base::Bind(&ExtendedAuthenticatorImpl::OnOperationComplete,
                  this,
                  "CheckKeyEx",
                  user_context,
                  success_callback));
 }
 
 void ExtendedAuthenticatorImpl::DoAddKey(const cryptohome::KeyDefinition& key,
                                      bool replace_existing,
                                      const base::Closure& success_callback,
                                      const UserContext& user_context) {
   RecordStartMarker("AddKeyEx");
 
-  std::string canonicalized = gaia::CanonicalizeEmail(user_context.GetUserID());
+  const std::string canonicalized =
+      gaia::CanonicalizeEmail(user_context.GetAccountId().GetUserEmail());
   cryptohome::Identification id(canonicalized);
   const Key* const auth_key = user_context.GetKey();
   cryptohome::Authorization auth(auth_key->GetSecret(), auth_key->GetLabel());
 
   cryptohome::HomedirMethods::GetInstance()->AddKeyEx(
       id,
       auth,
       key,
       replace_existing,
       base::Bind(&ExtendedAuthenticatorImpl::OnOperationComplete,
                  this,
                  "AddKeyEx",
                  user_context,
                  success_callback));
 }
 
 void ExtendedAuthenticatorImpl::DoUpdateKeyAuthorized(
     const cryptohome::KeyDefinition& key,
     const std::string& signature,
     const base::Closure& success_callback,
     const UserContext& user_context) {
   RecordStartMarker("UpdateKeyAuthorized");
 
-  std::string canonicalized = gaia::CanonicalizeEmail(user_context.GetUserID());
+  const std::string canonicalized =
+      gaia::CanonicalizeEmail(user_context.GetAccountId().GetUserEmail());
   cryptohome::Identification id(canonicalized);
   const Key* const auth_key = user_context.GetKey();
   cryptohome::Authorization auth(auth_key->GetSecret(), auth_key->GetLabel());
 
   cryptohome::HomedirMethods::GetInstance()->UpdateKeyEx(
       id,
       auth,
       key,
       signature,
       base::Bind(&ExtendedAuthenticatorImpl::OnOperationComplete,
                  this,
                  "UpdateKeyAuthorized",
                  user_context,
                  success_callback));
 }
 
 void ExtendedAuthenticatorImpl::DoRemoveKey(const std::string& key_to_remove,
                                         const base::Closure& success_callback,
                                         const UserContext& user_context) {
   RecordStartMarker("RemoveKeyEx");
 
-  std::string canonicalized = gaia::CanonicalizeEmail(user_context.GetUserID());
+  const std::string canonicalized =
+      gaia::CanonicalizeEmail(user_context.GetAccountId().GetUserEmail());
   cryptohome::Identification id(canonicalized);
   const Key* const auth_key = user_context.GetKey();
   cryptohome::Authorization auth(auth_key->GetSecret(), auth_key->GetLabel());
 
   cryptohome::HomedirMethods::GetInstance()->RemoveKeyEx(
       id,
       auth,
       key_to_remove,
       base::Bind(&ExtendedAuthenticatorImpl::OnOperationComplete,
                  this,
@@ skipping 67 matching lines @@
   if (consumer_)
     consumer_->OnAuthenticationFailure(state);
 
   if (old_consumer_) {
     AuthFailure failure(AuthFailure::UNLOCK_FAILED);
     old_consumer_->OnAuthFailure(failure);
   }
 }
 
 }  // namespace chromeos