diff options
| author | rogerta@chromium.org <rogerta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-30 04:51:54 +0000 |
|---|---|---|
| committer | rogerta@chromium.org <rogerta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-30 04:51:54 +0000 |
| commit | 4b69340badf50b7e45bd290eb7a0dc58ebd4c24b (patch) | |
| tree | f8c6e5a14a911a7c01bf3b980ceb87534197974c /chrome/browser/signin/account_reconcilor_unittest.cc | |
| parent | 858893cbdb80ad0eb89878d8fd588eb1fc47bc00 (diff) | |
| download | chromium_src-4b69340badf50b7e45bd290eb7a0dc58ebd4c24b.zip chromium_src-4b69340badf50b7e45bd290eb7a0dc58ebd4c24b.tar.gz chromium_src-4b69340badf50b7e45bd290eb7a0dc58ebd4c24b.tar.bz2 | |
Use new people.get api instead of oauth2/v1/userinfo.
Consolidate all uses into main helper class.
Details about new api: https://developers.google.com/+/api/latest/people/get
Format of returned response: https://developers.google.com/+/api/latest/people#resource
BUG=320354
Review URL: https://codereview.chromium.org/257773002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267068 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/signin/account_reconcilor_unittest.cc')
| -rw-r--r-- | chrome/browser/signin/account_reconcilor_unittest.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/chrome/browser/signin/account_reconcilor_unittest.cc b/chrome/browser/signin/account_reconcilor_unittest.cc index ca312d5..9da0f1d 100644 --- a/chrome/browser/signin/account_reconcilor_unittest.cc +++ b/chrome/browser/signin/account_reconcilor_unittest.cc @@ -262,7 +262,7 @@ TEST_F(AccountReconcilorTest, ValidateAccountsFromTokens) { reconcilor->ValidateAccountsFromTokenService(); ASSERT_FALSE(reconcilor->AreAllRefreshTokensChecked()); - SetFakeResponse("https://www.googleapis.com/oauth2/v1/userinfo", + SetFakeResponse(GaiaUrls::GetInstance()->people_get_url().spec(), "{\"id\":\"foo\"}", net::HTTP_OK, net::URLRequestStatus::SUCCESS); token_service()->IssueTokenForAllPendingRequests("access_token", base::Time::Now() + base::TimeDelta::FromHours(1)); @@ -284,7 +284,7 @@ TEST_F(AccountReconcilorTest, ValidateAccountsFromTokensFailedUserInfo) { reconcilor->ValidateAccountsFromTokenService(); ASSERT_FALSE(reconcilor->AreAllRefreshTokensChecked()); - SetFakeResponse("https://www.googleapis.com/oauth2/v1/userinfo", + SetFakeResponse(GaiaUrls::GetInstance()->people_get_url().spec(), "", net::HTTP_NOT_FOUND, net::URLRequestStatus::SUCCESS); token_service()->IssueTokenForAllPendingRequests("access_token", base::Time::Now() + base::TimeDelta::FromHours(1)); @@ -326,7 +326,7 @@ TEST_F(AccountReconcilorTest, StartReconcileNoop) { SetFakeResponse(GaiaUrls::GetInstance()->list_accounts_url().spec(), "[\"f\", [[\"b\", 0, \"n\", \"user@gmail.com\", \"p\", 0, 0, 0, 0, 1]]]", net::HTTP_OK, net::URLRequestStatus::SUCCESS); - SetFakeResponse("https://www.googleapis.com/oauth2/v1/userinfo", + SetFakeResponse(GaiaUrls::GetInstance()->people_get_url().spec(), "{\"id\":\"foo\"}", net::HTTP_OK, net::URLRequestStatus::SUCCESS); reconcilor->StartReconcile(); @@ -365,7 +365,7 @@ TEST_F(AccountReconcilorTest, StartReconcileNoopWithDots) { SetFakeResponse(GaiaUrls::GetInstance()->list_accounts_url().spec(), "[\"f\", [[\"b\", 0, \"n\", \"dot.s@gmail.com\", \"p\", 0, 0, 0, 0, 1]]]", net::HTTP_OK, net::URLRequestStatus::SUCCESS); - SetFakeResponse("https://www.googleapis.com/oauth2/v1/userinfo", + SetFakeResponse(GaiaUrls::GetInstance()->people_get_url().spec(), "{\"id\":\"foo\"}", net::HTTP_OK, net::URLRequestStatus::SUCCESS); reconcilor->StartReconcile(); @@ -400,7 +400,7 @@ TEST_F(AccountReconcilorTest, StartReconcileNoopMultiple) { "[\"f\", [[\"b\", 0, \"n\", \"user@gmail.com\", \"p\", 0, 0, 0, 0, 1], " "[\"b\", 0, \"n\", \"other@gmail.com\", \"p\", 0, 0, 0, 0, 1]]]", net::HTTP_OK, net::URLRequestStatus::SUCCESS); - SetFakeResponse("https://www.googleapis.com/oauth2/v1/userinfo", + SetFakeResponse(GaiaUrls::GetInstance()->people_get_url().spec(), "{\"id\":\"foo\"}", net::HTTP_OK, net::URLRequestStatus::SUCCESS); reconcilor->StartReconcile(); @@ -436,7 +436,7 @@ TEST_F(AccountReconcilorTest, StartReconcileAddToCookie) { SetFakeResponse(GaiaUrls::GetInstance()->list_accounts_url().spec(), "[\"f\", [[\"b\", 0, \"n\", \"user@gmail.com\", \"p\", 0, 0, 0, 0, 1]]]", net::HTTP_OK, net::URLRequestStatus::SUCCESS); - SetFakeResponse("https://www.googleapis.com/oauth2/v1/userinfo", + SetFakeResponse(GaiaUrls::GetInstance()->people_get_url().spec(), "{\"id\":\"foo\"}", net::HTTP_OK, net::URLRequestStatus::SUCCESS); AccountReconcilor* reconcilor = GetMockReconcilor(); @@ -464,7 +464,7 @@ TEST_F(AccountReconcilorTest, StartReconcileAddToChrome) { "[\"f\", [[\"b\", 0, \"n\", \"user@gmail.com\", \"p\", 0, 0, 0, 0, 1], " "[\"b\", 0, \"n\", \"other@gmail.com\", \"p\", 0, 0, 0, 0, 1]]]", net::HTTP_OK, net::URLRequestStatus::SUCCESS); - SetFakeResponse("https://www.googleapis.com/oauth2/v1/userinfo", + SetFakeResponse(GaiaUrls::GetInstance()->people_get_url().spec(), "{\"id\":\"foo\"}", net::HTTP_OK, net::URLRequestStatus::SUCCESS); AccountReconcilor* reconcilor = GetMockReconcilor(); @@ -491,7 +491,7 @@ TEST_F(AccountReconcilorTest, StartReconcileBadPrimary) { "[\"f\", [[\"b\", 0, \"n\", \"other@gmail.com\", \"p\", 0, 0, 0, 0, 1], " "[\"b\", 0, \"n\", \"user@gmail.com\", \"p\", 0, 0, 0, 0, 1]]]", net::HTTP_OK, net::URLRequestStatus::SUCCESS); - SetFakeResponse("https://www.googleapis.com/oauth2/v1/userinfo", + SetFakeResponse(GaiaUrls::GetInstance()->people_get_url().spec(), "{\"id\":\"foo\"}", net::HTTP_OK, net::URLRequestStatus::SUCCESS); AccountReconcilor* reconcilor = GetMockReconcilor(); @@ -522,7 +522,7 @@ TEST_F(AccountReconcilorTest, StartReconcileOnlyOnce) { SetFakeResponse(GaiaUrls::GetInstance()->list_accounts_url().spec(), "[\"f\", [[\"b\", 0, \"n\", \"user@gmail.com\", \"p\", 0, 0, 0, 0, 1]]]", net::HTTP_OK, net::URLRequestStatus::SUCCESS); - SetFakeResponse("https://www.googleapis.com/oauth2/v1/userinfo", + SetFakeResponse(GaiaUrls::GetInstance()->people_get_url().spec(), "{\"id\":\"foo\"}", net::HTTP_OK, net::URLRequestStatus::SUCCESS); ASSERT_FALSE(reconcilor->is_reconcile_started_); @@ -547,7 +547,7 @@ TEST_F(AccountReconcilorTest, StartReconcileWithSessionInfoExpiredDefault) { "[\"f\", [[\"b\", 0, \"n\", \"user@gmail.com\", \"p\", 0, 0, 0, 0, 0]," "[\"b\", 0, \"n\", \"other@gmail.com\", \"p\", 0, 0, 0, 0, 1]]]", net::HTTP_OK, net::URLRequestStatus::SUCCESS); - SetFakeResponse("https://www.googleapis.com/oauth2/v1/userinfo", + SetFakeResponse(GaiaUrls::GetInstance()->people_get_url().spec(), "{\"id\":\"foo\"}", net::HTTP_OK, net::URLRequestStatus::SUCCESS); AccountReconcilor* reconcilor = |