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

chrome/browser/signin/easy_unlock_service.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_H_
 #define CHROME_BROWSER_SIGNIN_EASY_UNLOCK_SERVICE_H_
 
 #include <set>
 #include <string>
 
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "chrome/browser/signin/chrome_proximity_auth_client.h"
 #include "chrome/browser/signin/easy_unlock_auth_attempt.h"
 #include "chrome/browser/signin/easy_unlock_metrics.h"
 #include "chrome/browser/signin/easy_unlock_screenlock_state_handler.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/proximity_auth/screenlock_state.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_types.h"
 #endif
 
+class AccountId;
+
 namespace base {
 class DictionaryValue;
 class ListValue;
 }
 
 namespace user_manager {
 class User;
 }
 
 namespace user_prefs {
@@ skipping 41 matching lines @@
   // logged in and his profile is initialized.
   static EasyUnlockService* GetForUser(const user_manager::User& user);
 
   // Registers Easy Unlock profile preferences.
   static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
 
   // Registers Easy Unlock local state entries.
   static void RegisterPrefs(PrefRegistrySimple* registry);
 
   // Removes the hardlock state for the given user.
-  static void ResetLocalStateForUser(const std::string& user_id);
+  static void ResetLocalStateForUser(const AccountId& account_id);
 
   // Returns the user's preferences.
-  static UserSettings GetUserSettings(const std::string& user_id);
+  static UserSettings GetUserSettings(const AccountId& account_id);
 
   // Returns the identifier for the device.
   static std::string GetDeviceId();
 
   // Returns the EasyUnlockService type.
   virtual Type GetType() const = 0;
 
   // Returns the user currently associated with the service.
-  virtual std::string GetUserEmail() const = 0;
+  virtual const AccountId GetAccountId() const = 0;

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

AccountId? Don't think const makes sense unless it's a const reference

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

Done.

It should be a constant reference, but it is not possible now (in this CL).

 
   // Launches Easy Unlock setup app.
   virtual void LaunchSetup() = 0;
 
   // Gets/Sets/Clears the permit access for the local device.
   virtual const base::DictionaryValue* GetPermitAccess() const = 0;
   virtual void SetPermitAccess(const base::DictionaryValue& permit) = 0;
   virtual void ClearPermitAccess() = 0;
 
   // Gets/Sets the remote devices list.
@@ skipping 14 matching lines @@
   // service.
   virtual std::string GetChallenge() const = 0;
 
   // Retrieved wrapped secret that should be used to unlock cryptohome for the
   // user currently associated with the service. If the service does not support
   // signin (i.e. service for a regular profile) or there is no secret available
   // for the user, returns an empty string.
   virtual std::string GetWrappedSecret() const = 0;
 
   // Records metrics for Easy sign-in outcome for the given user.
-  virtual void RecordEasySignInOutcome(const std::string& user_id,
+  virtual void RecordEasySignInOutcome(const AccountId& account_id,
                                        bool success) const = 0;
 
   // Records metrics for password based flow for the given user.
-  virtual void RecordPasswordLoginEvent(const std::string& user_id) const = 0;
+  virtual void RecordPasswordLoginEvent(const AccountId& account_id) const = 0;
 
   // Starts auto pairing.
   typedef base::Callback<void(bool success, const std::string& error)>
       AutoPairingResultCallback;
   virtual void StartAutoPairing(const AutoPairingResultCallback& callback) = 0;
 
   // Sets auto pairing result.
   virtual void SetAutoPairingResult(bool success, const std::string& error) = 0;
 
   // Sets the service up and schedules service initialization.
@@ skipping 26 matching lines @@
   // Updates the user pod on the signin/lock screen for the user associated with
   // the service to reflect the provided screenlock state.
   bool UpdateScreenlockState(proximity_auth::ScreenlockState state);
 
   // Returns the screenlock state if it is available. Otherwise STATE_INACTIVE
   // is returned.
   proximity_auth::ScreenlockState GetScreenlockState();
 
   // Starts an auth attempt for the user associated with the service. The
   // attempt type (unlock vs. signin) will depend on the service type.
-  void AttemptAuth(const std::string& user_id);
+  void AttemptAuth(const AccountId& account_id);
 
   // Similar to above but a callback is invoked after the auth attempt is
   // finalized instead of default unlock/sign-in.
   typedef EasyUnlockAuthAttempt::FinalizedCallback AttemptAuthCallback;
-  void AttemptAuth(const std::string& user_id,
+  void AttemptAuth(const AccountId& account_id,
                    const AttemptAuthCallback& callback);
 
   // Finalizes the previously started auth attempt for easy unlock. If called on
   // signin profile service, it will cancel the current auth attempt if one
   // exists.
   void FinalizeUnlock(bool success);
 
   // Finalizes previously started auth attempt for easy signin. If called on
   // regular profile service, it will cancel the current auth attempt if one
   // exists.
   void FinalizeSignin(const std::string& secret);
 
   // Handles Easy Unlock auth failure for the user.
-  void HandleAuthFailure(const std::string& user_id);
+  void HandleAuthFailure(const AccountId& account_id);
 
   // Checks the consistency between pairing data and cryptohome keys. Set
   // hardlock state if the two do not match.
   void CheckCryptohomeKeysAndMaybeHardlock();
 
   // Marks the Easy Unlock screen lock state as the one associated with the
   // trial run initiated by Easy Unlock app.
   void SetTrialRun();
 
   // Records that the user clicked on the lock icon during the trial run
@@ skipping 66 matching lines @@
   void SetScreenlockHardlockedState(
       EasyUnlockScreenlockStateHandler::HardlockState state);
 
   const EasyUnlockScreenlockStateHandler* screenlock_state_handler() const {
     return screenlock_state_handler_.get();
   }
 
   // Saves hardlock state for the given user. Update UI if the currently
   // associated user is the same.
   void SetHardlockStateForUser(
-      const std::string& user_id,
+      const AccountId& account_id,
       EasyUnlockScreenlockStateHandler::HardlockState state);
 
   // Returns the authentication event for a recent password sign-in or unlock,
   // according to the current state of the service.
   EasyUnlockAuthEvent GetPasswordAuthEvent() const;
 
   // Called by subclasses when the remote device allowed to unlock the screen
   // changes. If |remote_device| is not null, then |proximity_auth_system_| will
   // be recreated with the new remote device. Otherwise,
   // |proximity_auth_system_| will be destroyed if no |remote_device| is set.
@@ skipping 11 matching lines @@
   // is created. Do not cache the returned value, as it may go away if Easy
   // Unlock gets disabled.
   EasyUnlockScreenlockStateHandler* GetScreenlockStateHandler();
 
   // Callback when Bluetooth adapter present state changes.
   void OnBluetoothAdapterPresentChanged();
 
 #if defined(OS_CHROMEOS)
   // Callback for get key operation from CheckCryptohomeKeysAndMaybeHardlock.
   void 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);
 #endif
 
   // Updates the service to state for handling system suspend.
   void PrepareForSuspend();
 
   // Called when the system resumes from a suspended state.
   void OnSuspendDone();
@@ skipping 36 matching lines @@
   bool tpm_key_checked_;
 
   base::ObserverList<EasyUnlockServiceObserver> observers_;
 
   base::WeakPtrFactory<EasyUnlockService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(EasyUnlockService);
 };
 
 #endif  // CHROME_BROWSER_SIGNIN_EASY_UNLOCK_SERVICE_H_