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

chrome/browser/signin/easy_unlock_service_regular.h

 // 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.
 
 #ifndef CHROME_BROWSER_SIGNIN_EASY_UNLOCK_SERVICE_REGULAR_H_
 #define CHROME_BROWSER_SIGNIN_EASY_UNLOCK_SERVICE_REGULAR_H_
 
 #include <string>
 
 #include "base/callback.h"
@@ skipping 59 matching lines @@
   // Loads the RemoteDevice instances that will be supplied to
   // ProximityAuthSystem.
   void LoadRemoteDevices();
 
   // Called when |remote_device_loader_| completes.
   void OnRemoteDevicesLoaded(
       const std::vector<proximity_auth::RemoteDevice>& remote_devices);
 
   // EasyUnlockService implementation:
   EasyUnlockService::Type GetType() const override;
-  std::string GetUserEmail() const override;
+  const AccountId GetAccountId() const override;

[achuithb, 2015/12/04 10:12:53]

AccountId?

[Alexander Alekseev, 2015/12/04 12:44:07]

Done.

   void LaunchSetup() override;
   const base::DictionaryValue* GetPermitAccess() const override;
   void SetPermitAccess(const base::DictionaryValue& permit) override;
   void ClearPermitAccess() override;
   const base::ListValue* GetRemoteDevices() const override;
   void SetRemoteDevices(const base::ListValue& devices) override;
   void SetRemoteBleDevices(const base::ListValue& devices) override;
   void RunTurnOffFlow() override;
   void ResetTurnOffFlow() override;
   TurnOffFlowStatus GetTurnOffFlowStatus() const override;
   std::string GetChallenge() const override;
   std::string GetWrappedSecret() const override;
-  void RecordEasySignInOutcome(const std::string& user_id,
+  void RecordEasySignInOutcome(const AccountId& account_id,
                                bool success) const override;
-  void RecordPasswordLoginEvent(const std::string& user_id) const override;
+  void RecordPasswordLoginEvent(const AccountId& account_id) const override;
   void StartAutoPairing(const AutoPairingResultCallback& callback) override;
   void SetAutoPairingResult(bool success, const std::string& error) override;
   void InitializeInternal() override;
   void ShutdownInternal() override;
   bool IsAllowedInternal() const override;
   void OnWillFinalizeUnlock(bool success) override;
   void OnSuspendDoneInternal() override;
 
   // OAuth2TokenService::Observer:
   void OnRefreshTokenAvailable(const std::string& account_id) override;
 
   // CryptAuthDeviceManager::Observer:
   void OnSyncFinished(
       proximity_auth::CryptAuthDeviceManager::SyncResult sync_result,
       proximity_auth::CryptAuthDeviceManager::DeviceChangeResult
           device_change_result) override;
 
   // proximity_auth::ScreenlockBridge::Observer implementation:
   void OnScreenDidLock(proximity_auth::ScreenlockBridge::LockHandler::ScreenType
                            screen_type) override;
   void OnScreenDidUnlock(
       proximity_auth::ScreenlockBridge::LockHandler::ScreenType screen_type)
       override;
-  void OnFocusedUserChanged(const std::string& user_id) override;
-
+  void OnFocusedUserChanged(const AccountId& account_id) override;
 
   // Callback when the controlling pref changes.
   void OnPrefsChanged();
 
   // Sets the new turn-off flow status.
   void SetTurnOffFlowStatus(TurnOffFlowStatus status);
 
   // Callback for ToggleEasyUnlock CryptAuth API.
   void OnToggleEasyUnlockApiComplete(
       const cryptauth::ToggleEasyUnlockResponse& response);
@@ skipping 59 matching lines @@
   // this deferment prevents the lock screen from being changed by a network
   // event.
   bool deferring_device_load_;
 
   base::WeakPtrFactory<EasyUnlockServiceRegular> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(EasyUnlockServiceRegular);
 };
 
 #endif  // CHROME_BROWSER_SIGNIN_EASY_UNLOCK_SERVICE_REGULAR_H_