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

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=267068

Review URL: https://codereview.chromium.org/257773002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267374 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 45 insertions, 14 deletions

diff --git a/google_apis/gaia/gaia_oauth_client_unittest.cc b/google_apis/gaia/gaia_oauth_client_unittest.cc
index d4014f7..338578e 100644
--- a/google_apis/gaia/gaia_oauth_client_unittest.cc
+++ b/google_apis/gaia/gaia_oauth_client_unittest.cc
@@ -134,25 +134,22 @@ const std::string kTestUserId = "8675309";
 const int kTestExpiresIn = 3920;
 
 const std::string kDummyGetTokensResult =
-  "{\"access_token\":\"" + kTestAccessToken + "\","
-  "\"expires_in\":" + base::IntToString(kTestExpiresIn) + ","
-  "\"refresh_token\":\"" + kTestRefreshToken + "\"}";
+    "{\"access_token\":\"" + kTestAccessToken + "\","
+    "\"expires_in\":" + base::IntToString(kTestExpiresIn) + ","
+    "\"refresh_token\":\"" + kTestRefreshToken + "\"}";
 
 const std::string kDummyRefreshTokenResult =
-  "{\"access_token\":\"" + kTestAccessToken + "\","
-  "\"expires_in\":" + base::IntToString(kTestExpiresIn) + "}";
-
-const std::string kDummyUserInfoResult =
-  "{\"email\":\"" + kTestUserEmail + "\"}";
+    "{\"access_token\":\"" + kTestAccessToken + "\","
+    "\"expires_in\":" + base::IntToString(kTestExpiresIn) + "}";
 
 const std::string kDummyUserIdResult =
-  "{\"id\":\"" + kTestUserId + "\"}";
+    "{\"id\":\"" + kTestUserId + "\"}";
 
 const std::string kDummyTokenInfoResult =
-  "{\"issued_to\": \"1234567890.apps.googleusercontent.com\","
-  "\"audience\": \"1234567890.apps.googleusercontent.com\","
-  "\"scope\": \"https://googleapis.com/oauth2/v2/tokeninfo\","
-  "\"expires_in\":" + base::IntToString(kTestExpiresIn) + "}";
+    "{\"issued_to\": \"1234567890.apps.googleusercontent.com\","
+    "\"audience\": \"1234567890.apps.googleusercontent.com\","
+    "\"scope\": \"https://googleapis.com/oauth2/v2/tokeninfo\","
+    "\"expires_in\":" + base::IntToString(kTestExpiresIn) + "}";
 }
 
 namespace gaia {
@@ -304,11 +301,45 @@ TEST_F(GaiaOAuthClientTest, RefreshTokenDownscopingSuccess) {
   factory.get_url_fetcher()->Finish();
 }
 
-
 TEST_F(GaiaOAuthClientTest, GetUserEmail) {
   MockGaiaOAuthClientDelegate delegate;
   EXPECT_CALL(delegate, OnGetUserEmailResponse(kTestUserEmail)).Times(1);
 
+  const std::string kDummyUserInfoResult =
+      "{\"emails\": [{\"value\":\"" + kTestUserEmail +
+      "\", \"type\":\"account\"}]}";
+
+  MockOAuthFetcherFactory factory;
+  factory.set_results(kDummyUserInfoResult);
+
+  GaiaOAuthClient auth(GetRequestContext());
+  auth.GetUserEmail("access_token", 1, &delegate);
+}
+
+TEST_F(GaiaOAuthClientTest, GetUserEmailSecondItemValid) {
+  MockGaiaOAuthClientDelegate delegate;
+  EXPECT_CALL(delegate, OnGetUserEmailResponse(kTestUserEmail)).Times(1);
+
+  const std::string kDummyUserInfoResult =
+      "{\"emails\": [{\"value\":\"foo\"},"
+      "{\"value\":\"" + kTestUserEmail +
+      "\", \"type\":\"account\"}]}";
+
+  MockOAuthFetcherFactory factory;
+  factory.set_results(kDummyUserInfoResult);
+
+  GaiaOAuthClient auth(GetRequestContext());
+  auth.GetUserEmail("access_token", 1, &delegate);
+}
+
+TEST_F(GaiaOAuthClientTest, GetUserEmailNoValidItems) {
+  MockGaiaOAuthClientDelegate delegate;
+  EXPECT_CALL(delegate, OnNetworkError(_)).Times(1);
+
+  const std::string kDummyUserInfoResult =
+      "{\"emails\": [{\"value\":\"" + kTestUserEmail +
+      "\", \"type\":\"foo\"}]}";
+
   MockOAuthFetcherFactory factory;
   factory.set_results(kDummyUserInfoResult);