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

chrome/browser/chromeos/login/easy_unlock/bootstrap_manager.h

Index: chrome/browser/chromeos/login/easy_unlock/bootstrap_manager.h
diff --git a/chrome/browser/chromeos/login/easy_unlock/bootstrap_manager.h b/chrome/browser/chromeos/login/easy_unlock/bootstrap_manager.h
index 46955baf54ad8dde0ca0cb4922030df398712a21..88879c877ca540f0c6fa5aa8c07846bf7cb0ff9d 100644
--- a/chrome/browser/chromeos/login/easy_unlock/bootstrap_manager.h
+++ b/chrome/browser/chromeos/login/easy_unlock/bootstrap_manager.h
@@ -9,6 +9,7 @@
 
 #include "base/macros.h"
 
+class AccountId;
 class PrefRegistrySimple;
 
 namespace chromeos {
@@ -21,7 +22,7 @@ class BootstrapManager {
 
   class Delegate {
    public:
-    virtual void RemovePendingBootstrapUser(const std::string& user_id) = 0;
+    virtual void RemovePendingBootstrapUser(const AccountId& account_id) = 0;
 
    protected:
     virtual ~Delegate() {}
@@ -30,11 +31,11 @@ class BootstrapManager {
   explicit BootstrapManager(Delegate* delegate);
   ~BootstrapManager();
 
-  void AddPendingBootstrap(const std::string& user_id);
-  void FinishPendingBootstrap(const std::string& user_id);
+  void AddPendingBootstrap(const AccountId& account_id);
+  void FinishPendingBootstrap(const AccountId& account_id);
   void RemoveAllPendingBootstrap();
 
-  bool HasPendingBootstrap(const std::string& user_id) const;
+  bool HasPendingBootstrap(const AccountId& account_id) const;
 
  private:
   Delegate* delegate_;