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

chrome/browser/signin/easy_unlock_screenlock_state_handler.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_SCREENLOCK_STATE_HANDLER_H_
 #define CHROME_BROWSER_SIGNIN_EASY_UNLOCK_SCREENLOCK_STATE_HANDLER_H_
 
 #include <string>
 
 #include "base/strings/string16.h"
 #include "components/proximity_auth/screenlock_bridge.h"
 #include "components/proximity_auth/screenlock_state.h"
+#include "components/signin/core/account_id/account_id.h"
 
 class PrefService;
 
 // Profile specific class responsible for updating screenlock UI for the user
 // associated with the profile when their Easy Unlock state changes.
 class EasyUnlockScreenlockStateHandler
     : public proximity_auth::ScreenlockBridge::Observer {
  public:
   // Hard lock states.
   enum HardlockState {
     NO_HARDLOCK = 0,           // Hard lock is not enforced. This is default.
     USER_HARDLOCK = 1 << 0,    // Hard lock is requested by user.
     PAIRING_CHANGED = 1 << 1,  // Hard lock because pairing data is changed.
     NO_PAIRING = 1 << 2,       // Hard lock because there is no pairing data.
     LOGIN_FAILED = 1 << 3,     // Transient hard lock caused by login attempt
                                // failure. Reset when screen is unlocked.
     PAIRING_ADDED = 1 << 4,    // Similar to PAIRING_CHANGED when it happens
                                // on a new Chromebook.
   };
 
-  // |user_email|: The email for the user associated with the profile to which
-  //     this class is attached.
+  // |account_id|: The account id of the user associated with the profile to
+  //     which this class is attached.
   // |initial_hardlock_state|: The initial hardlock state.
   // |screenlock_bridge|: The screenlock bridge used to update the screen lock
   //     state.
   EasyUnlockScreenlockStateHandler(
-      const std::string& user_email,
+      const AccountId& account_id,
       HardlockState initial_hardlock_state,
       proximity_auth::ScreenlockBridge* screenlock_bridge);
   ~EasyUnlockScreenlockStateHandler() override;
 
   // Returns true if handler is not in INACTIVE state.
   bool IsActive() const;
 
   // Whether the handler is in state that is allowed just after auth failure
   // (i.e. the state that would cause auth failure rather than one caused by an
   // auth failure).
@@ skipping 18 matching lines @@
 
   proximity_auth::ScreenlockState state() const { return state_; }
 
  private:
   // proximity_auth::ScreenlockBridge::Observer:
   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;
 
   // Forces refresh of the Easy Unlock screenlock UI.
   void RefreshScreenlockState();
 
   void ShowHardlockUI();
 
   // Updates icon's tooltip options.
   void UpdateTooltipOptions(
       proximity_auth::ScreenlockBridge::UserPodCustomIconOptions* icon_options);
 
   // Gets the name to be used for the device. The name depends on the device
   // type (example values: Chromebook and Chromebox).
   base::string16 GetDeviceName();
 
   // Updates the screenlock auth type if it has to be changed.
   void UpdateScreenlockAuthType();
 
   proximity_auth::ScreenlockState state_;
-  std::string user_email_;
+  const AccountId account_id_;
   proximity_auth::ScreenlockBridge* screenlock_bridge_;
 
   // State of hardlock.
   HardlockState hardlock_state_;
-  bool hardlock_ui_shown_;
+  bool hardlock_ui_shown_ = false;
 
   // Whether this is the trial Easy Unlock run. If this is the case, a
   // tutorial message should be shown and hard-locking be disabled. The trial
   // run should be set if the screen was locked by the Easy Unlock setup app.
-  bool is_trial_run_;
+  bool is_trial_run_ = false;
 
   // Whether the user's phone was ever locked while on the current lock screen.
-  bool did_see_locked_phone_;
+  bool did_see_locked_phone_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(EasyUnlockScreenlockStateHandler);
 };
 
 #endif  // CHROME_BROWSER_SIGNIN_EASY_UNLOCK_SCREENLOCK_STATE_HANDLER_H_