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..5e8f233b4a9670b0f766585e8ce57def7e764394 100644 |
--- a/chrome/browser/chromeos/login/user_flow.cc |
+++ b/chrome/browser/chromeos/login/user_flow.cc |
@@ -12,8 +12,8 @@ namespace chromeos { |
namespace { |
-void UnregisterFlow(const std::string& user_id) { |
- ChromeUserManager::Get()->ResetUserFlow(AccountId::FromUserEmail(user_id)); |
+void UnregisterFlow(const AccountId& account_id) { |
achuithb
2015/12/04 10:12:52
This function seems unnecessary?
Alexander Alekseev
2015/12/04 12:44:06
This is used in ExtendedUserFlow::UnregisterFlowSo
achuithb
2015/12/04 20:16:56
No, I meant that in UnregisterFlowSoon, you could
Alexander Alekseev
2015/12/05 05:20:07
Done.
|
+ ChromeUserManager::Get()->ResetUserFlow(account_id); |
} |
} // namespace |
@@ -70,9 +70,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 +88,8 @@ 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(&UnregisterFlow, account_id())); |
} |
} // namespace chromeos |