This CL replaces user_manager::UserID with AccountId.

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(user_id);
+  ChromeUserManager::Get()->ResetUserFlow(AccountId::FromUserEmail(user_id));
 }
 
 } // namespace
 
 
 UserFlow::UserFlow() : host_(NULL) {}
 
 UserFlow::~UserFlow() {}
 
 void UserFlow::SetHost(LoginDisplayHost* host) {
@@ skipping 62 matching lines @@
 }
 
 void ExtendedUserFlow::UnregisterFlowSoon() {
   std::string id_copy(user_id());
   base::MessageLoop::current()->PostTask(FROM_HERE,
       base::Bind(&UnregisterFlow,
                  id_copy));
 }
 
 }  // namespace chromeos