Reverting 267374 on 36 branch.

google_apis/gaia/gaia_urls.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.
 
 #include "google_apis/gaia/gaia_urls.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "google_apis/gaia/gaia_switches.h"
 #include "google_apis/google_api_keys.h"
@@ skipping 24 matching lines @@
 // API calls from accounts.google.com (LSO)
 const char kGetOAuthTokenUrlSuffix[] = "o/oauth/GetOAuthToken/";
 const char kClientLoginToOAuth2UrlSuffix[] = "o/oauth2/programmatic_auth";
 const char kOAuth2AuthUrlSuffix[] = "o/oauth2/auth";
 const char kOAuth2RevokeUrlSuffix[] = "o/oauth2/revoke";
 const char kOAuth2TokenUrlSuffix[] = "o/oauth2/token";
 
 // API calls from www.googleapis.com
 const char kOAuth2IssueTokenUrlSuffix[] = "oauth2/v2/IssueToken";
 const char kOAuth2TokenInfoUrlSuffix[] = "oauth2/v2/tokeninfo";
-const char kPeopleGetUrlSuffix[] = "plus/v1/people/me";
+const char kOAuthUserInfoUrlSuffix[] = "oauth2/v1/userinfo";
 
 void GetSwitchValueWithDefault(const char* switch_value,
                                const char* default_value,
                                std::string* output_value) {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switch_value)) {
     *output_value = command_line->GetSwitchValueASCII(switch_value);
   } else {
     *output_value = default_value;
   }
@@ skipping 55 matching lines @@
       lso_origin_url_.Resolve(kClientLoginToOAuth2UrlSuffix);
   oauth2_auth_url_ = lso_origin_url_.Resolve(kOAuth2AuthUrlSuffix);
   oauth2_token_url_ = lso_origin_url_.Resolve(kOAuth2TokenUrlSuffix);
   oauth2_revoke_url_ = lso_origin_url_.Resolve(kOAuth2RevokeUrlSuffix);
 
   // URLs from www.googleapis.com.
   oauth2_issue_token_url_ =
       google_apis_origin_url_.Resolve(kOAuth2IssueTokenUrlSuffix);
   oauth2_token_info_url_ =
       google_apis_origin_url_.Resolve(kOAuth2TokenInfoUrlSuffix);
-  people_get_url_ =
-      google_apis_origin_url_.Resolve(kPeopleGetUrlSuffix);
+  oauth_user_info_url_ =
+      google_apis_origin_url_.Resolve(kOAuthUserInfoUrlSuffix);
 
   gaia_login_form_realm_ = gaia_url_;
 }
 
 GaiaUrls::~GaiaUrls() {
 }
 
 const GURL& GaiaUrls::gaia_url() const {
   return gaia_url_;
 }
@@ skipping 39 matching lines @@
 }
 
 const GURL& GaiaUrls::oauth_get_access_token_url() const {
   return oauth_get_access_token_url_;
 }
 
 const GURL& GaiaUrls::oauth_wrap_bridge_url() const {
   return oauth_wrap_bridge_url_;
 }
 
-const GURL& GaiaUrls::people_get_url() const {
-  return people_get_url_;
+const GURL& GaiaUrls::oauth_user_info_url() const {
+  return oauth_user_info_url_;
 }
 
 const GURL& GaiaUrls::oauth_revoke_token_url() const {
   return oauth_revoke_token_url_;
 }
 
 const GURL& GaiaUrls::oauth1_login_url() const {
   return oauth1_login_url_;
 }
 
@@ skipping 37 matching lines @@
   return oauth2_token_info_url_;
 }
 
 const GURL& GaiaUrls::oauth2_revoke_url() const {
   return oauth2_revoke_url_;
 }
 
 const GURL& GaiaUrls::gaia_login_form_realm() const {
   return gaia_url_;
 }