This CL replaces e-mail with AccountId in easy signin code.

chrome/browser/signin/easy_unlock_service.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/easy_unlock_service.h"
 
 #include "apps/app_lifetime_monitor.h"
 #include "apps/app_lifetime_monitor_factory.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 285 matching lines @@
 void EasyUnlockService::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterStringPref(prefs::kEasyUnlockDeviceId, std::string());
   registry->RegisterDictionaryPref(prefs::kEasyUnlockHardlockState);
   registry->RegisterDictionaryPref(prefs::kEasyUnlockLocalStateUserPrefs);
 #if defined(OS_CHROMEOS)
   EasyUnlockTpmKeyManager::RegisterLocalStatePrefs(registry);
 #endif
 }
 
 // static
-void EasyUnlockService::ResetLocalStateForUser(const std::string& user_id) {
-  DCHECK(!user_id.empty());
+void EasyUnlockService::ResetLocalStateForUser(const AccountId& account_id) {
+  DCHECK(account_id.is_valid());
 
   PrefService* local_state = GetLocalState();
   if (!local_state)
     return;
 
   DictionaryPrefUpdate update(local_state, prefs::kEasyUnlockHardlockState);
-  update->RemoveWithoutPathExpansion(user_id, NULL);
+  update->RemoveWithoutPathExpansion(account_id.GetUserEmail(), NULL);
 
 #if defined(OS_CHROMEOS)
-  EasyUnlockTpmKeyManager::ResetLocalStateForUser(user_id);
+  EasyUnlockTpmKeyManager::ResetLocalStateForUser(account_id);
 #endif
 }
 
 // static
 EasyUnlockService::UserSettings EasyUnlockService::GetUserSettings(
-    const std::string& user_id) {
-  DCHECK(!user_id.empty());
+    const AccountId& account_id) {
+  DCHECK(account_id.is_valid());
   UserSettings user_settings;
 
   PrefService* local_state = GetLocalState();
   if (!local_state)
     return user_settings;
 
   const base::DictionaryValue* all_user_prefs_dict =
       local_state->GetDictionary(prefs::kEasyUnlockLocalStateUserPrefs);
   if (!all_user_prefs_dict)
     return user_settings;
 
   const base::DictionaryValue* user_prefs_dict;
-  if (!all_user_prefs_dict->GetDictionaryWithoutPathExpansion(user_id,
-                                                              &user_prefs_dict))
+  if (!all_user_prefs_dict->GetDictionaryWithoutPathExpansion(
+          account_id.GetUserEmail(), &user_prefs_dict))
     return user_settings;
 
   user_prefs_dict->GetBooleanWithoutPathExpansion(
       prefs::kEasyUnlockProximityRequired,
       &user_settings.require_close_proximity);
 
   return user_settings;
 }
 
 // static
@@ skipping 41 matching lines @@
   const base::ListValue* devices = GetRemoteDevices();
   return devices && !devices->empty();
 }
 
 void EasyUnlockService::OpenSetupApp() {
   app_manager_->LaunchSetup();
 }
 
 void EasyUnlockService::SetHardlockState(
     EasyUnlockScreenlockStateHandler::HardlockState state) {
-  const std::string user_id = GetUserEmail();
-  if (user_id.empty())
+  const AccountId& account_id = GetAccountId();
+  if (!account_id.is_valid())
     return;
 
   if (state == GetHardlockState())
     return;
 
-  SetHardlockStateForUser(user_id, state);
+  SetHardlockStateForUser(account_id, state);
 }
 
 EasyUnlockScreenlockStateHandler::HardlockState
 EasyUnlockService::GetHardlockState() const {
   EasyUnlockScreenlockStateHandler::HardlockState state;
   if (GetPersistedHardlockState(&state))
     return state;
 
   return EasyUnlockScreenlockStateHandler::NO_HARDLOCK;
 }
 
 bool EasyUnlockService::GetPersistedHardlockState(
     EasyUnlockScreenlockStateHandler::HardlockState* state) const {
-  std::string user_id = GetUserEmail();
-  if (user_id.empty())
+  const AccountId& account_id = GetAccountId();
+  if (!account_id.is_valid())
     return false;
 
   PrefService* local_state = GetLocalState();
   if (!local_state)
     return false;
 
   const base::DictionaryValue* dict =
       local_state->GetDictionary(prefs::kEasyUnlockHardlockState);
   int state_int;
-  if (dict && dict->GetIntegerWithoutPathExpansion(user_id, &state_int)) {
+  if (dict &&
+      dict->GetIntegerWithoutPathExpansion(account_id.GetUserEmail(),
+                                           &state_int)) {
     *state =
         static_cast<EasyUnlockScreenlockStateHandler::HardlockState>(state_int);
     return true;
   }
 
   return false;
 }
 
 void EasyUnlockService::ShowInitialUserState() {
   if (!GetScreenlockStateHandler())
@@ skipping 11 matching lines @@
     screenlock_state_handler_->MaybeShowHardlockUI();
   }
 }
 
 EasyUnlockScreenlockStateHandler*
     EasyUnlockService::GetScreenlockStateHandler() {
   if (!IsAllowed())
     return NULL;
   if (!screenlock_state_handler_) {
     screenlock_state_handler_.reset(new EasyUnlockScreenlockStateHandler(
-        GetUserEmail(), GetHardlockState(),
+        GetAccountId(), GetHardlockState(),
         proximity_auth::ScreenlockBridge::Get()));
   }
   return screenlock_state_handler_.get();
 }
 
 bool EasyUnlockService::UpdateScreenlockState(ScreenlockState state) {
   EasyUnlockScreenlockStateHandler* handler = GetScreenlockStateHandler();
   if (!handler)
     return false;
 
   handler->ChangeState(state);
 
   if (state == ScreenlockState::AUTHENTICATED) {
 #if defined(OS_CHROMEOS)
     if (power_monitor_)
       power_monitor_->RecordStartUpTime();
 #endif
   } else if (auth_attempt_.get()) {
     // Clean up existing auth attempt if we can no longer authenticate the
     // remote device.
     auth_attempt_.reset();
 
     if (!handler->InStateValidOnRemoteAuthFailure())
-      HandleAuthFailure(GetUserEmail());
+      HandleAuthFailure(GetAccountId());
   }
 
   FOR_EACH_OBSERVER(
       EasyUnlockServiceObserver, observers_, OnScreenlockStateChanged(state));
   return true;
 }
 
 ScreenlockState EasyUnlockService::GetScreenlockState() {
   EasyUnlockScreenlockStateHandler* handler = GetScreenlockStateHandler();
   if (!handler)
     return ScreenlockState::INACTIVE;
 
   return handler->state();
 }
 
-void EasyUnlockService::AttemptAuth(const std::string& user_id) {
-  AttemptAuth(user_id, AttemptAuthCallback());
+void EasyUnlockService::AttemptAuth(const AccountId& account_id) {
+  AttemptAuth(account_id, AttemptAuthCallback());
 }
 
-void EasyUnlockService::AttemptAuth(const std::string& user_id,
+void EasyUnlockService::AttemptAuth(const AccountId& account_id,
                                     const AttemptAuthCallback& callback) {
   const EasyUnlockAuthAttempt::Type auth_attempt_type =
       GetType() == TYPE_REGULAR ? EasyUnlockAuthAttempt::TYPE_UNLOCK
                                 : EasyUnlockAuthAttempt::TYPE_SIGNIN;
-  const std::string user_email = GetUserEmail();
-  if (user_email.empty()) {
-    LOG(ERROR) << "Empty user email. Refresh token might go bad.";
+  if (!GetAccountId().is_valid()) {
+    LOG(ERROR) << "Empty user account. Refresh token might go bad.";
     if (!callback.is_null()) {
       const bool kFailure = false;
-      callback.Run(auth_attempt_type, kFailure, user_id, std::string(),
+      callback.Run(auth_attempt_type, kFailure, account_id, std::string(),
                    std::string());
     }
     return;
   }
 
-  CHECK_EQ(GetUserEmail(), user_id);
+  CHECK(GetAccountId() == account_id)
+      << "Check failed: " << GetAccountId().Serialize() << " vs "
+      << account_id.Serialize();
 
-  auth_attempt_.reset(new EasyUnlockAuthAttempt(app_manager_.get(), user_id,
+  auth_attempt_.reset(new EasyUnlockAuthAttempt(app_manager_.get(), account_id,
                                                 auth_attempt_type, callback));
   if (!auth_attempt_->Start())
     auth_attempt_.reset();
 
   // TODO(tengs): We notify ProximityAuthSystem whenever unlock attempts are
   // attempted. However, we ideally should refactor the auth attempt logic to
   // the proximity_auth component.
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           proximity_auth::switches::kEnableBluetoothLowEnergyDiscovery) &&
       proximity_auth_system_) {
-    proximity_auth_system_->OnAuthAttempted(user_id);
+    proximity_auth_system_->OnAuthAttempted(account_id);
   }
 }
 
 void EasyUnlockService::FinalizeUnlock(bool success) {
   if (!auth_attempt_.get())
     return;
 
   this->OnWillFinalizeUnlock(success);
-  auth_attempt_->FinalizeUnlock(GetUserEmail(), success);
+  auth_attempt_->FinalizeUnlock(GetAccountId(), success);
   auth_attempt_.reset();
   // TODO(isherman): If observing screen unlock events, is there a race
   // condition in terms of reading the service's state vs. the app setting the
   // state?
 
   // Make sure that the lock screen is updated on failure.
   if (!success) {
     RecordEasyUnlockScreenUnlockEvent(EASY_UNLOCK_FAILURE);
-    HandleAuthFailure(GetUserEmail());
+    HandleAuthFailure(GetAccountId());
   }
 }
 
 void EasyUnlockService::FinalizeSignin(const std::string& key) {
   if (!auth_attempt_.get())
     return;
   std::string wrapped_secret = GetWrappedSecret();
   if (!wrapped_secret.empty())
-    auth_attempt_->FinalizeSignin(GetUserEmail(), wrapped_secret, key);
+    auth_attempt_->FinalizeSignin(GetAccountId(), wrapped_secret, key);
   auth_attempt_.reset();
 
   // Processing empty key is equivalent to auth cancellation. In this case the
   // signin request will not actually be processed by login stack, so the lock
   // screen state should be set from here.
   if (key.empty())
-    HandleAuthFailure(GetUserEmail());
+    HandleAuthFailure(GetAccountId());
 }
 
-void EasyUnlockService::HandleAuthFailure(const std::string& user_id) {
-  if (user_id != GetUserEmail())
+void EasyUnlockService::HandleAuthFailure(const AccountId& account_id) {
+  if (account_id != GetAccountId())
     return;
 
   if (!screenlock_state_handler_.get())
     return;
 
   screenlock_state_handler_->SetHardlockState(
       EasyUnlockScreenlockStateHandler::LOGIN_FAILED);
 }
 
 void EasyUnlockService::CheckCryptohomeKeysAndMaybeHardlock() {
 #if defined(OS_CHROMEOS)
-  std::string user_id = GetUserEmail();
-  if (user_id.empty())
+  const AccountId& account_id = GetAccountId();
+  if (!account_id.is_valid())
     return;
 
   const base::ListValue* device_list = GetRemoteDevices();
   std::set<std::string> paired_devices;
   if (device_list) {
     chromeos::EasyUnlockDeviceKeyDataList parsed_paired;
     chromeos::EasyUnlockKeyManager::RemoteDeviceListToDeviceDataList(
         *device_list, &parsed_paired);
     for (const auto& device_key_data : parsed_paired)
       paired_devices.insert(device_key_data.psk);
   }
   if (paired_devices.empty()) {
     SetHardlockState(EasyUnlockScreenlockStateHandler::NO_PAIRING);
     return;
   }
 
   // No need to compare if a change is already recorded.
   if (GetHardlockState() == EasyUnlockScreenlockStateHandler::PAIRING_CHANGED ||
       GetHardlockState() == EasyUnlockScreenlockStateHandler::PAIRING_ADDED) {
     return;
   }
 
   chromeos::EasyUnlockKeyManager* key_manager =
       chromeos::UserSessionManager::GetInstance()->GetEasyUnlockKeyManager();
   DCHECK(key_manager);
 
   key_manager->GetDeviceDataList(
-      chromeos::UserContext(AccountId::FromUserEmail(user_id)),
+      chromeos::UserContext(account_id),
       base::Bind(&EasyUnlockService::OnCryptohomeKeysFetchedForChecking,
-                 weak_ptr_factory_.GetWeakPtr(), user_id, paired_devices));
+                 weak_ptr_factory_.GetWeakPtr(), account_id, paired_devices));
 #endif
 }
 
 void EasyUnlockService::SetTrialRun() {
   DCHECK_EQ(GetType(), TYPE_REGULAR);
 
   EasyUnlockScreenlockStateHandler* handler = GetScreenlockStateHandler();
   if (handler)
     handler->SetTrialRun();
 }
@@ skipping 64 matching lines @@
 #endif
     }
   }
 }
 
 void EasyUnlockService::DisableAppWithoutResettingScreenlockState() {
   app_manager_->DisableAppIfLoaded();
 }
 
 void EasyUnlockService::NotifyUserUpdated() {
-  std::string user_id = GetUserEmail();
-  if (user_id.empty())
+  const AccountId& account_id = GetAccountId();
+  if (!account_id.is_valid())
     return;
 
   // Notify the easy unlock app that the user info changed.
   bool logged_in = GetType() == TYPE_REGULAR;
   bool data_ready = logged_in || GetRemoteDevices() != NULL;
-  app_manager_->SendUserUpdatedEvent(user_id, logged_in, data_ready);
+  app_manager_->SendUserUpdatedEvent(account_id.GetUserEmail(), logged_in,
+                                     data_ready);
 }
 
 void EasyUnlockService::NotifyTurnOffOperationStatusChanged() {
   FOR_EACH_OBSERVER(
       EasyUnlockServiceObserver, observers_, OnTurnOffOperationStatusChanged());
 }
 
 void EasyUnlockService::ResetScreenlockState() {
   screenlock_state_handler_.reset();
   auth_attempt_.reset();
@@ skipping 32 matching lines @@
         bttype = BT_NORMAL;
       }
 #endif
     }
     UMA_HISTOGRAM_ENUMERATION(
       "EasyUnlock.BluetoothAvailability", bttype, BT_MAX_TYPE);
   }
 }
 
 void EasyUnlockService::SetHardlockStateForUser(
-      const std::string& user_id,
-      EasyUnlockScreenlockStateHandler::HardlockState state) {
-  DCHECK(!user_id.empty());
+    const AccountId& account_id,
+    EasyUnlockScreenlockStateHandler::HardlockState state) {
+  DCHECK(account_id.is_valid());
 
   PrefService* local_state = GetLocalState();
   if (!local_state)
     return;
 
   DictionaryPrefUpdate update(local_state, prefs::kEasyUnlockHardlockState);
-  update->SetIntegerWithoutPathExpansion(user_id, static_cast<int>(state));
+  update->SetIntegerWithoutPathExpansion(account_id.GetUserEmail(),
+                                         static_cast<int>(state));
 
-  if (GetUserEmail() == user_id)
+  if (GetAccountId() == account_id)
     SetScreenlockHardlockedState(state);
 }
 
 EasyUnlockAuthEvent EasyUnlockService::GetPasswordAuthEvent() const {
   DCHECK(IsEnabled());
 
   if (GetHardlockState() != EasyUnlockScreenlockStateHandler::NO_HARDLOCK) {
     switch (GetHardlockState()) {
       case EasyUnlockScreenlockStateHandler::NO_HARDLOCK:
         NOTREACHED();
@@ skipping 59 matching lines @@
         *remote_device, proximity_auth_client()));
     proximity_auth_system_->Start();
   } else {
     PA_LOG(INFO) << "Remote device removed, destroying ProximityAuthSystem.";
     proximity_auth_system_.reset();
   }
 }
 
 #if defined(OS_CHROMEOS)
 void EasyUnlockService::OnCryptohomeKeysFetchedForChecking(
-    const std::string& user_id,
+    const AccountId& account_id,
     const std::set<std::string> paired_devices,
     bool success,
     const chromeos::EasyUnlockDeviceKeyDataList& key_data_list) {
-  DCHECK(!user_id.empty() && !paired_devices.empty());
+  DCHECK(account_id.is_valid() && !paired_devices.empty());
 
   if (!success) {
-    SetHardlockStateForUser(user_id,
+    SetHardlockStateForUser(account_id,
                             EasyUnlockScreenlockStateHandler::NO_PAIRING);
     return;
   }
 
   std::set<std::string> devices_in_cryptohome;
   for (const auto& device_key_data : key_data_list)
     devices_in_cryptohome.insert(device_key_data.psk);
 
   if (paired_devices != devices_in_cryptohome ||
       GetHardlockState() == EasyUnlockScreenlockStateHandler::NO_PAIRING) {
     SetHardlockStateForUser(
-        user_id,
-        devices_in_cryptohome.empty()
-            ? EasyUnlockScreenlockStateHandler::PAIRING_ADDED
-            : EasyUnlockScreenlockStateHandler::PAIRING_CHANGED);
+        account_id, devices_in_cryptohome.empty()
+                        ? EasyUnlockScreenlockStateHandler::PAIRING_ADDED
+                        : EasyUnlockScreenlockStateHandler::PAIRING_CHANGED);
   }
 }
 #endif
 
 void EasyUnlockService::PrepareForSuspend() {
   app_manager_->DisableAppIfLoaded();
   if (screenlock_state_handler_ && screenlock_state_handler_->IsActive())
     UpdateScreenlockState(ScreenlockState::BLUETOOTH_CONNECTING);
   if (proximity_auth_system_)
     proximity_auth_system_->OnSuspend();
 }
 
 void EasyUnlockService::OnSuspendDone() {
   if (proximity_auth_system_)
     proximity_auth_system_->OnSuspendDone();
 }
 
 void EasyUnlockService::EnsureTpmKeyPresentIfNeeded() {
-  if (tpm_key_checked_ || GetType() != TYPE_REGULAR || GetUserEmail().empty() ||
+  if (tpm_key_checked_ || GetType() != TYPE_REGULAR || GetAccountId().empty() ||
       GetHardlockState() == EasyUnlockScreenlockStateHandler::NO_PAIRING) {
     return;
   }
 
 #if defined(OS_CHROMEOS)
   // If this is called before the session is started, the chances are Chrome
   // is restarting in order to apply user flags. Don't check TPM keys in this
   // case.
   if (!user_manager::UserManager::Get() ||
       !user_manager::UserManager::Get()->IsSessionStarted())
     return;
 
   // TODO(tbarzic): Set check_private_key only if previous sign-in attempt
   // failed.
   EasyUnlockTpmKeyManagerFactory::GetInstance()->Get(profile_)
       ->PrepareTpmKey(true /* check_private_key */,
                       base::Closure());
 #endif  // defined(OS_CHROMEOS)
 
   tpm_key_checked_ = true;
 }