Reverted 136345 - Ran into GAIA dosserver issues in prod for http://accounts.google.com. We are goi…

chrome/common/net/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 "chrome/common/net/gaia/gaia_urls.h"
 
 #include "base/command_line.h"
 #include "chrome/common/chrome_switches.h"
 
 namespace {
 
-// Gaia service constants
-const char kDefaultGaiaBaseUrl[] = "accounts.google.com";
+const char kDefaultGaiaBaseUrl[] = "www.google.com";
 
-const char kCaptchaUrlPrefixSuffix[] = "/";
-const char kClientLoginUrlSuffix[] = "/ClientLogin";
-const char kServiceLoginUrlSuffix[] = "/ServiceLogin";
-const char kIssueAuthTokenUrlSuffix[] = "/IssueAuthToken";
-const char kGetUserInfoUrlSuffix[] = "/GetUserInfo";
-const char kTokenAuthUrlSuffix[] = "/TokenAuth";
-const char kMergeSessionUrlSuffix[] = "/MergeSession";
+const char kCaptchaUrlPrefixSuffix[] = "/accounts/";
+const char kClientLoginUrlSuffix[] = "/accounts/ClientLogin";
+const char kIssueAuthTokenUrlSuffix[] = "/accounts/IssueAuthToken";
+const char kGetUserInfoUrlSuffix[] = "/accounts/GetUserInfo";
+const char kTokenAuthUrlSuffix[] = "/accounts/TokenAuth";
+const char kMergeSessionUrlSuffix[] = "/accounts/MergeSession";
 
-const char kOAuthGetAccessTokenUrlSuffix[] = "/OAuthGetAccessToken";
-const char kOAuthWrapBridgeUrlSuffix[] = "/OAuthWrapBridge";
-const char kOAuth1LoginUrlSuffix[] = "/OAuthLogin";
-const char kOAuthRevokeTokenUrlSuffix[] = "/AuthSubRevokeToken";
-
-// Federated login constants
-const char kDefaultFederatedLoginBaseUrl[] = "https://www.google.com/accounts";
-const char kGetOAuthTokenUrlSuffix[] = "/o8/GetOAuthToken";
+const char kGetOAuthTokenUrlSuffix[] = "/accounts/o8/GetOAuthToken";
+const char kOAuthGetAccessTokenUrlSuffix[] = "/accounts/OAuthGetAccessToken";
+const char kOAuthWrapBridgeUrlSuffix[] = "/accounts/OAuthWrapBridge";
+const char kOAuth1LoginUrlSuffix[] = "/accounts/OAuthLogin";
+const char kOAuthRevokeTokenUrlSuffix[] = "/accounts/AuthSubRevokeToken";
 
 // OAuth2 client id for Google Chrome which is registered as an
 // installed application.
 static const char kOAuth2ChromeClientId[] =
     "77185425430.apps.googleusercontent.com";
 // For an installed application, client secret is not really a secret since
 // it is expected to be embeeded in the application.
 // See documentation at
 // http://code.google.com/apis/accounts/docs/OAuth2InstalledApp.html
 static const char kOAuth2ChromeClientSecret[] =
     "OTJgUOQcT7lO7GsGZq2G4IlT";
 const char kClientLoginToOAuth2Url[] =
     "https://accounts.google.com/o/oauth2/programmatic_auth";
 const char kOAuth2TokenUrl[] =
     "https://accounts.google.com/o/oauth2/token";
 const char kOAuth2IssueTokenUrl[] =
     "https://www.googleapis.com/oauth2/v2/IssueToken";
-
 }  // namespacce
 
 GaiaUrls* GaiaUrls::GetInstance() {
   return Singleton<GaiaUrls>::get();
 }
 
 GaiaUrls::GaiaUrls() {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   std::string host_base;
   if (command_line->HasSwitch(switches::kGaiaHost)) {
     host_base = command_line->GetSwitchValueASCII(switches::kGaiaHost);
   } else {
     host_base = kDefaultGaiaBaseUrl;
   }
 
   captcha_url_prefix_ = "http://" + host_base + kCaptchaUrlPrefixSuffix;
   gaia_origin_url_ = "https://" + host_base;
   client_login_url_ = gaia_origin_url_ + kClientLoginUrlSuffix;
-  service_login_url_ = gaia_origin_url_ + kServiceLoginUrlSuffix;
   issue_auth_token_url_ = gaia_origin_url_ + kIssueAuthTokenUrlSuffix;
   get_user_info_url_ = gaia_origin_url_ + kGetUserInfoUrlSuffix;
   token_auth_url_ = gaia_origin_url_ + kTokenAuthUrlSuffix;
   merge_session_url_ = gaia_origin_url_ + kMergeSessionUrlSuffix;
 
-  // Federated login is not part of Gaia and has its own endpoints.
-  get_oauth_token_url_ = std::string(kDefaultFederatedLoginBaseUrl) +
-                         kGetOAuthTokenUrlSuffix;
-
+  get_oauth_token_url_ = gaia_origin_url_ + kGetOAuthTokenUrlSuffix;
   oauth_get_access_token_url_ = gaia_origin_url_ +
                                 kOAuthGetAccessTokenUrlSuffix;
   oauth_wrap_bridge_url_ = gaia_origin_url_ + kOAuthWrapBridgeUrlSuffix;
   oauth_revoke_token_url_ = gaia_origin_url_ + kOAuthRevokeTokenUrlSuffix;
   oauth1_login_url_ = gaia_origin_url_ + kOAuth1LoginUrlSuffix;
 
   // TODO(joaodasilva): these aren't configurable for now, but are managed here
   // so that users of Gaia URLs don't have to use static constants.
   // http://crbug.com/97126
   oauth1_login_scope_ = "https://www.google.com/accounts/OAuthLogin";
@@ skipping 20 matching lines @@
 }
 
 const std::string& GaiaUrls::gaia_origin_url() {
   return gaia_origin_url_;
 }
 
 const std::string& GaiaUrls::client_login_url() {
   return client_login_url_;
 }
 
-const std::string& GaiaUrls::service_login_url() {
-  return service_login_url_;
-}
-
 const std::string& GaiaUrls::issue_auth_token_url() {
   return issue_auth_token_url_;
 }
 
 const std::string& GaiaUrls::get_user_info_url() {
   return get_user_info_url_;
 }
 
 const std::string& GaiaUrls::token_auth_url() {
   return token_auth_url_;
@@ skipping 56 matching lines @@
 }
 
 const std::string& GaiaUrls::oauth2_issue_token_url() {
   return oauth2_issue_token_url_;
 }
 
 
 const std::string& GaiaUrls::gaia_login_form_realm() {
   return gaia_login_form_realm_;
 }