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

chrome/browser/chromeos/login/user_flow.cc

Index: chrome/browser/chromeos/login/user_flow.cc
diff --git a/chrome/browser/chromeos/login/user_flow.cc b/chrome/browser/chromeos/login/user_flow.cc
index 74e37c34cd7a55bb115c242a19c0de04c514c6b8..5df5639c2b0473680277f02e2df58777f2474442 100644
--- a/chrome/browser/chromeos/login/user_flow.cc
+++ b/chrome/browser/chromeos/login/user_flow.cc
@@ -10,15 +10,6 @@
 
 namespace chromeos {
 
-namespace {
-
-void UnregisterFlow(const std::string& user_id) {
-  ChromeUserManager::Get()->ResetUserFlow(AccountId::FromUserEmail(user_id));
-}
-
-} // namespace
-
-
 UserFlow::UserFlow() : host_(NULL) {}
 
 UserFlow::~UserFlow() {}
@@ -70,9 +61,8 @@ void DefaultUserFlow::HandleOAuthTokenStatusChange(
 void DefaultUserFlow::LaunchExtraSteps(Profile* profile) {
 }
 
-ExtendedUserFlow::ExtendedUserFlow(const std::string& user_id)
-    : user_id_(user_id) {
-}
+ExtendedUserFlow::ExtendedUserFlow(const AccountId& account_id)
+    : account_id_(account_id) {}
 
 ExtendedUserFlow::~ExtendedUserFlow() {
 }
@@ -89,10 +79,10 @@ void ExtendedUserFlow::HandleOAuthTokenStatusChange(
 }
 
 void ExtendedUserFlow::UnregisterFlowSoon() {
-  std::string id_copy(user_id());
-  base::MessageLoop::current()->PostTask(FROM_HERE,
-      base::Bind(&UnregisterFlow,
-                 id_copy));
+  base::MessageLoop::current()->PostTask(
+      FROM_HERE,
+      base::Bind(&ChromeUserManager::ResetUserFlow,
+                 base::Unretained(ChromeUserManager::Get()), account_id()));
 }
 
 }  // namespace chromeos