Update oauth2 token endpoint.

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 "base/strings/stringprintf.h"
 #include "google_apis/gaia/gaia_switches.h"
@@ skipping 23 matching lines @@
 const char kListAccountsSuffix[] = "ListAccounts?json=standard";
 const char kEmbeddedSigninSuffix[] = "EmbeddedSignIn";
 const char kAddAccountSuffix[] = "AddSession";
 const char kGetCheckConnectionInfoSuffix[] = "GetCheckConnectionInfo";
 
 // 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";
 const char kOAuth2IFrameUrlSuffix[] = "o/oauth2/iframerpc";
 
 // API calls from www.googleapis.com
+const char kOAuth2TokenUrlSuffix[] = "oauth2/v4/token";
 const char kOAuth2IssueTokenUrlSuffix[] = "oauth2/v2/IssueToken";
 const char kOAuth2TokenInfoUrlSuffix[] = "oauth2/v2/tokeninfo";
 const char kOAuthUserInfoUrlSuffix[] = "oauth2/v1/userinfo";
 
 void GetSwitchValueWithDefault(const char* switch_value,
                                const char* default_value,
                                std::string* output_value) {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switch_value)) {
     *output_value = command_line->GetSwitchValueASCII(switch_value);
@@ skipping 56 matching lines @@
   embedded_signin_url_ = gaia_url_.Resolve(kEmbeddedSigninSuffix);
   add_account_url_ = gaia_url_.Resolve(kAddAccountSuffix);
   get_check_connection_info_url_ =
       gaia_url_.Resolve(kGetCheckConnectionInfoSuffix);
 
   // URLs from accounts.google.com (LSO).
   get_oauth_token_url_ = lso_origin_url_.Resolve(kGetOAuthTokenUrlSuffix);
   client_login_to_oauth2_url_ =
       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);
   oauth2_iframe_url_ =
       lso_origin_url_.Resolve(kOAuth2IFrameUrlSuffix);
 
   // URLs from www.googleapis.com.
+  oauth2_token_url_ = google_apis_origin_url_.Resolve(kOAuth2TokenUrlSuffix);
   oauth2_issue_token_url_ =
       google_apis_origin_url_.Resolve(kOAuth2IssueTokenUrlSuffix);
   oauth2_token_info_url_ =
       google_apis_origin_url_.Resolve(kOAuth2TokenInfoUrlSuffix);
   oauth_user_info_url_ =
       google_apis_origin_url_.Resolve(kOAuthUserInfoUrlSuffix);
 
   gaia_login_form_realm_ = gaia_url_;
 }
 
@@ skipping 136 matching lines @@
                         : service_logout_url_.Resolve(
                               base::StringPrintf("?source=%s", source.c_str()));
 }
 
 GURL GaiaUrls::GetCheckConnectionInfoURLWithSource(const std::string& source) {
   return source.empty()
       ? get_check_connection_info_url_
       : get_check_connection_info_url_.Resolve(
             base::StringPrintf("?source=%s", source.c_str()));
 }