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

chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.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/extensions/api/easy_unlock_private/easy_unlock_private_api.h"
 
 #include <vector>
 
 #include "base/base64url.h"
 #include "base/bind.h"
@@ skipping 24 matching lines @@
 #include "components/proximity_auth/cryptauth/cryptauth_enrollment_manager.h"
 #include "components/proximity_auth/cryptauth/cryptauth_enrollment_utils.h"
 #include "components/proximity_auth/cryptauth/proto/cryptauth_api.pb.h"
 #include "components/proximity_auth/cryptauth/secure_message_delegate.h"
 #include "components/proximity_auth/logging/logging.h"
 #include "components/proximity_auth/proximity_auth_client.h"
 #include "components/proximity_auth/remote_device.h"
 #include "components/proximity_auth/screenlock_bridge.h"
 #include "components/proximity_auth/screenlock_state.h"
 #include "components/proximity_auth/switches.h"
+#include "components/signin/core/account_id/account_id.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/browser_context_keyed_api_factory.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/range/range.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/system/chromeos/devicetype_utils.h"
 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.h"
@@ skipping 779 matching lines @@
   const std::string challenge =
       EasyUnlockService::Get(profile)->GetChallenge();
   if (!challenge.empty() && !params->nonce.empty()) {
     EasyUnlockTpmKeyManager* key_manager =
         EasyUnlockTpmKeyManagerFactory::GetInstance()->Get(profile);
     if (!key_manager) {
       SetError("No EasyUnlockTpmKeyManager.");
       return false;
     }
     key_manager->SignUsingTpmKey(
-        EasyUnlockService::Get(profile)->GetUserEmail(),
+        EasyUnlockService::Get(profile)->GetAccountId(),
         std::string(params->nonce.begin(), params->nonce.end()),
         base::Bind(&EasyUnlockPrivateGetSignInChallengeFunction::OnDone, this,
                    challenge));
   } else {
     OnDone(challenge, std::string());
   }
   return true;
 #else  // if !defined(OS_CHROMEOS)
   SetError("Sign-in not supported.");
   return false;
@@ skipping 31 matching lines @@
 EasyUnlockPrivateGetUserInfoFunction::EasyUnlockPrivateGetUserInfoFunction() {
 }
 
 EasyUnlockPrivateGetUserInfoFunction::~EasyUnlockPrivateGetUserInfoFunction() {
 }
 
 bool EasyUnlockPrivateGetUserInfoFunction::RunSync() {
   EasyUnlockService* service =
       EasyUnlockService::Get(Profile::FromBrowserContext(browser_context()));
   std::vector<linked_ptr<easy_unlock_private::UserInfo> > users;
-  std::string user_id = service->GetUserEmail();
-  if (!user_id.empty()) {
+  const AccountId& account_id = service->GetAccountId();
+  if (account_id.is_valid()) {
     users.push_back(
         linked_ptr<easy_unlock_private::UserInfo>(
             new easy_unlock_private::UserInfo()));
-    users[0]->user_id = user_id;
+    users[0]->user_id = account_id.GetUserEmail();
     users[0]->logged_in = service->GetType() == EasyUnlockService::TYPE_REGULAR;
     users[0]->data_ready = users[0]->logged_in ||
                            service->GetRemoteDevices() != NULL;
 
     EasyUnlockService::UserSettings user_settings =
-        EasyUnlockService::GetUserSettings(user_id);
+        EasyUnlockService::GetUserSettings(account_id);
     users[0]->require_close_proximity = user_settings.require_close_proximity;
 
     users[0]->device_user_id = proximity_auth::CalculateDeviceUserId(
-        EasyUnlockService::GetDeviceId(), user_id);
+        EasyUnlockService::GetDeviceId(), account_id.GetUserEmail());
 
     users[0]->ble_discovery_enabled =
         base::CommandLine::ForCurrentProcess()->HasSwitch(
             proximity_auth::switches::kEnableBluetoothLowEnergyDiscovery);
   }
   results_ = easy_unlock_private::GetUserInfo::Results::Create(users);
   return true;
 }
 
 EasyUnlockPrivateGetConnectionInfoFunction::
@@ skipping 253 matching lines @@
           ->GetDeviceAddress(extension(), params->connection_id);
   results_ =
       easy_unlock_private::SetupConnectionGetDeviceAddress::Results::Create(
           device_address);
   if (device_address.empty())
     SetError("Invalid connectionId.");
   return true;
 }
 
 }  // namespace extensions