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

chrome/browser/chromeos/login/user_flow.cc

 // Copyright (c) 2012 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.
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/chromeos/login/user_flow.h"
 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "components/signin/core/account_id/account_id.h"
 
 namespace chromeos {
 
-namespace {
-
-void UnregisterFlow(const std::string& user_id) {
-  ChromeUserManager::Get()->ResetUserFlow(AccountId::FromUserEmail(user_id));
-}
-
-} // namespace
-
-
 UserFlow::UserFlow() : host_(NULL) {}
 
 UserFlow::~UserFlow() {}
 
 void UserFlow::SetHost(LoginDisplayHost* host) {
   VLOG(1) << "Flow " << this << " got host " << host;
   host_ = host;
 }
 
 DefaultUserFlow::~DefaultUserFlow() {}
@@ skipping 31 matching lines @@
   return false;
 }
 
 void DefaultUserFlow::HandleOAuthTokenStatusChange(
     user_manager::User::OAuthTokenStatus status) {
 }
 
 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() {
 }
 
 void ExtendedUserFlow::AppendAdditionalCommandLineSwitches() {
 }
 
 bool ExtendedUserFlow::ShouldShowSettings() {
   return true;
 }
 
 void ExtendedUserFlow::HandleOAuthTokenStatusChange(
     user_manager::User::OAuthTokenStatus status) {
 }
 
 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