Reverting 267374 on 36 branch.

google_apis/gaia/gaia_oauth_client.h

Index: google_apis/gaia/gaia_oauth_client.h
===================================================================
--- google_apis/gaia/gaia_oauth_client.h	(revision 280060)
+++ google_apis/gaia/gaia_oauth_client.h	(working copy)
@@ -47,9 +47,6 @@
     virtual void OnGetUserEmailResponse(const std::string& user_email) {}
     // Invoked on a successful response to the GetUserId request.
     virtual void OnGetUserIdResponse(const std::string& user_id) {}
-    // Invoked on a successful response to the GetUserInfo request.
-    virtual void OnGetUserInfoResponse(
-        scoped_ptr<base::DictionaryValue> user_info) {}
     // Invoked on a successful response to the GetTokenInfo request.
     virtual void OnGetTokenInfoResponse(
         scoped_ptr<base::DictionaryValue> token_info) {}
@@ -91,7 +88,7 @@
                     int max_retries,
                     Delegate* delegate);
 
-  // Call the people.get API, returning the user email address associated
+  // Call the userinfo API, returning the user email address associated
   // with the given access token. The provided access token must have
   // https://www.googleapis.com/auth/userinfo.email as one of its scopes.
   // See |max_retries| docs above.
@@ -99,23 +96,14 @@
                     int max_retries,
                     Delegate* delegate);
 
-  // Call the people.get API, returning the user gaia ID associated
+  // Call the userinfo API, returning the user gaia ID associated
   // with the given access token. The provided access token must have
-  // https://www.googleapis.com/auth/userinfo.profile as one of its scopes.
+  // https://www.googleapis.com/auth/userinfo as one of its scopes.
   // See |max_retries| docs above.
   void GetUserId(const std::string& oauth_access_token,
                  int max_retries,
                  Delegate* delegate);
 
-  // Call the people.get API, returning the user info associated
-  // with the given access token. The provided access token must have
-  // https://www.googleapis.com/auth/userinfo.email and
-  // https://www.googleapis.com/auth/userinfo.profile as its scopes.
-  // See |max_retries| docs above.
-  void GetUserInfo(const std::string& oauth_access_token,
-                   int max_retries,
-                   Delegate* delegate);
-
   // Call the tokeninfo API, returning a dictionary of response values. The
   // provided access token may have any scope, and basic results will be
   // returned: issued_to, audience, scope, expires_in, access_type. In