Chromium Code Reviews| 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..96613dbe9c0c58d9465a60f76d52c1ab6c4167e9 100644 |
| --- a/chrome/browser/extensions/api/identity/identity_apitest.cc |
| +++ b/chrome/browser/extensions/api/identity/identity_apitest.cc |
| @@ -573,20 +573,23 @@ 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); |
| + |
| + //SignIn(account_key); |
|
Ken Rockot(use gerrit already)
2015/04/13 16:03:01
nit: remove this
Roger Tawa OOO till Jul 10th
2015/04/13 17:45:09
Done.
|
| +#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_; |