Revert of Use new people.get api instead of oauth2/v1/userinfo.

google_apis/gaia/gaia_oauth_client_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // A complete set of unit tests for GaiaOAuthClient.
 
 #include <string>
 #include <vector>
 
 #include "base/strings/string_number_conversions.h"
@@ skipping 116 matching lines @@
 };
 
 const std::string kTestAccessToken = "1/fFAGRNJru1FTz70BzhT3Zg";
 const std::string kTestRefreshToken =
     "1/6BMfW9j53gdGImsixUH6kU5RsR4zwI9lUVX-tqf8JXQ";
 const std::string kTestUserEmail = "a_user@gmail.com";
 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) + "}";
+  "{\"access_token\":\"" + kTestAccessToken + "\","
+  "\"expires_in\":" + base::IntToString(kTestExpiresIn) + "}";
+
+const std::string kDummyUserInfoResult =
+  "{\"email\":\"" + kTestUserEmail + "\"}";
 
 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 {
 
 class GaiaOAuthClientTest : public testing::Test {
  protected:
   virtual void SetUp() OVERRIDE {
     client_info_.client_id = "test_client_id";
     client_info_.client_secret = "test_client_secret";
     client_info_.redirect_uri = "test_redirect_uri";
@@ skipping 131 matching lines @@
   factory.set_complete_immediately(false);
 
   GaiaOAuthClient auth(GetRequestContext());
   auth.RefreshToken(client_info_, "refresh_token",
                     std::vector<std::string>(1, "scope4test"), -1, &delegate);
   EXPECT_THAT(factory.get_url_fetcher()->upload_data(),
               HasSubstr("&scope=scope4test"));
   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);
 
   GaiaOAuthClient auth(GetRequestContext());
   auth.GetUserEmail("access_token", 1, &delegate);
 }
 
 TEST_F(GaiaOAuthClientTest, GetUserId) {
   MockGaiaOAuthClientDelegate delegate;
   EXPECT_CALL(delegate, OnGetUserIdResponse(kTestUserId)).Times(1);
 
   MockOAuthFetcherFactory factory;
@@ skipping 15 matching lines @@
 
   GaiaOAuthClient auth(GetRequestContext());
   auth.GetTokenInfo("access_token", 1, &delegate);
 
   std::string issued_to;
   ASSERT_TRUE(captured_result->GetString("issued_to",  &issued_to));
   ASSERT_EQ("1234567890.apps.googleusercontent.com", issued_to);
 }
 
 }  // namespace gaia