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

chrome/browser/chromeos/login/user_flow.h

Index: chrome/browser/chromeos/login/user_flow.h
diff --git a/chrome/browser/chromeos/login/user_flow.h b/chrome/browser/chromeos/login/user_flow.h
index aa5d2558b08ee03949e85acc05304e76a8114cf3..08232e529ce698770af30c2ef3118fe1f81bb158 100644
--- a/chrome/browser/chromeos/login/user_flow.h
+++ b/chrome/browser/chromeos/login/user_flow.h
@@ -8,8 +8,11 @@
 #include "base/compiler_specific.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chromeos/login/auth/auth_status_consumer.h"
+#include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user.h"
 
+class AccountId;

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

don't think you need this?

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

Done.

+
 namespace chromeos {
 
 class UserContext;
@@ -69,7 +72,7 @@ class DefaultUserFlow : public UserFlow {
 // UserFlow stub for non-regular flows.
 class ExtendedUserFlow : public UserFlow {
  public:
-  explicit ExtendedUserFlow(const std::string& user_id);
+  explicit ExtendedUserFlow(const AccountId& account_id);
   ~ExtendedUserFlow() override;
 
   void AppendAdditionalCommandLineSwitches() override;
@@ -80,12 +83,10 @@ class ExtendedUserFlow : public UserFlow {
  protected:
   // Subclasses can call this method to unregister flow in the next event.
   virtual void UnregisterFlowSoon();
-  std::string user_id() {
-    return user_id_;
-  }
+  const AccountId& account_id() { return account_id_; }
 
  private:
-  std::string user_id_;
+  AccountId account_id_;

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

const?

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

Done.

 };
 
 }  // namespace chromeos