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

chromeos/login/auth/login_performer.h

Index: chromeos/login/auth/login_performer.h
diff --git a/chromeos/login/auth/login_performer.h b/chromeos/login/auth/login_performer.h
index a4e6ab36cc06e671515d71a238fdf96d6306a491..68b5aa1feaedaddf3f3994d580971bc6c9aaddb8 100644
--- a/chromeos/login/auth/login_performer.h
+++ b/chromeos/login/auth/login_performer.h
@@ -18,6 +18,8 @@
 #include "chromeos/login/auth/user_context.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 
+class AccountId;
+
 namespace net {
 class URLRequestContextGetter;
 }
@@ -116,7 +118,7 @@ class CHROMEOS_EXPORT LoginPerformer : public AuthStatusConsumer {
   // Check if user is allowed to sign in on device. |wildcard_match| will
   // contain additional information whether this user is explicitly listed or
   // not (may be relevant for extension-based sign-in).
-  virtual bool IsUserWhitelisted(const std::string& user_id,
+  virtual bool IsUserWhitelisted(const AccountId& account_id,
                                  bool* wildcard_match) = 0;
 
  protected:
@@ -131,7 +133,7 @@ class CHROMEOS_EXPORT LoginPerformer : public AuthStatusConsumer {
   // Either |success_callback| or |failure_callback| should be called upon this
   // check.
   virtual void RunOnlineWhitelistCheck(
-      const std::string& user_id,
+      const AccountId& account_id,
       bool wildcard_match,
       const std::string& refresh_token,
       const base::Closure& success_callback,
@@ -150,14 +152,14 @@ class CHROMEOS_EXPORT LoginPerformer : public AuthStatusConsumer {
   virtual UserContext TransformSupervisedKey(const UserContext& context) = 0;
 
   // Set up sign-in flow for supervised user.
-  virtual void SetupSupervisedUserFlow(const std::string& user_id) = 0;
+  virtual void SetupSupervisedUserFlow(const AccountId& account_id) = 0;
 
   // Set up sign-in flow for Easy Unlock.
-  virtual void SetupEasyUnlockUserFlow(const std::string& user_id) = 0;
+  virtual void SetupEasyUnlockUserFlow(const AccountId& account_id) = 0;
 
-  // Run policy check for |user_id|. If something is wrong, delegate's
+  // Run policy check for |account_id|. If something is wrong, delegate's
   // PolicyLoadFailed is called.
-  virtual bool CheckPolicyForUser(const std::string& user_id) = 0;
+  virtual bool CheckPolicyForUser(const AccountId& account_id) = 0;
 
   // Look up browser context to use during signin.
   virtual content::BrowserContext* GetSigninContext() = 0;