Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5227)

Unified Diff: chrome/browser/extensions/api/identity/identity_apitest.cc

Issue 964563002: Replace SetAuthenticatedUsername with SetAuthenticatedAccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@priv
Patch Set: rebased Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/identity/identity_apitest.cc
diff --git a/chrome/browser/extensions/api/identity/identity_apitest.cc b/chrome/browser/extensions/api/identity/identity_apitest.cc
index 5ff783d700c988e691d65f4091203d9a5a596319..1d4ba1e0460c0c276f5af76ba020a4acffe4d9c2 100644
--- a/chrome/browser/extensions/api/identity/identity_apitest.cc
+++ b/chrome/browser/extensions/api/identity/identity_apitest.cc
@@ -573,20 +573,22 @@ class IdentityTestWithSignin : public AsyncExtensionBrowserTest {
}
protected:
- void SignIn(const std::string account_key) {
-#if defined(OS_CHROMEOS)
- signin_manager_->SetAuthenticatedUsername(account_key);
-#else
- signin_manager_->SignIn(account_key, "password");
-#endif
- token_service_->IssueRefreshTokenForUser(account_key, "refresh_token");
+ void SignIn(const std::string& account_key) {
+ SignIn(account_key, account_key);
}
- void SignIn(const std::string& account_key, const std::string& gaia) {
+ void SignIn(const std::string& email, const std::string& gaia) {
AccountTrackerService* account_tracker =
AccountTrackerServiceFactory::GetForProfile(profile());
- account_tracker->SeedAccountInfo(gaia, account_key);
- SignIn(account_key);
+ std::string account_id =
+ account_tracker->SeedAccountInfo(gaia, email);
+
+#if defined(OS_CHROMEOS)
+ signin_manager_->SetAuthenticatedAccountInfo(gaia, email);
+#else
+ signin_manager_->SignIn(gaia, email, "password");
+#endif
+ token_service_->IssueRefreshTokenForUser(account_id, "refresh_token");
}
FakeSigninManagerForTesting* signin_manager_;

Powered by Google App Engine
This is Rietveld 408576698