Moved /GetOAuthToken GAIA request to accounts.google.com.

BUG=147347
TEST=ChromeOS login BVTs


Review URL: https://chromiumcodereview.appspot.com/10910234

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156596 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 2 insertions, 40 deletions

diff --git a/google_apis/gaia/gaia_switches.cc b/google_apis/gaia/gaia_switches.cc
index 038bc2f..dae016a 100644
--- a/google_apis/gaia/gaia_switches.cc
+++ b/google_apis/gaia/gaia_switches.cc
@@ -8,8 +8,6 @@ namespace switches {
 
 const char kClientLoginToOAuth2Url[]        = "client-login-to-oauth2-url";
 const char kGaiaHost[]                      = "gaia-host";
-const char kGaiaOAuthHost[]                 = "gaia-oauth-host";
-const char kGaiaOAuthUrlPath[]              = "gaia-oauth-url-path";
 const char kGaiaUrlPath[]                   = "gaia-url-path";
 const char kOAuth1LoginScope[]              = "oauth1-login-scope";
 const char kOAuth2IssueTokenUrl[]           = "oauth2-issue-token-url";
diff --git a/google_apis/gaia/gaia_switches.h b/google_apis/gaia/gaia_switches.h
index f8ec659..79e0eb9 100644
--- a/google_apis/gaia/gaia_switches.h
+++ b/google_apis/gaia/gaia_switches.h
@@ -15,16 +15,6 @@ extern const char kClientLoginToOAuth2Url[];
 // omitted. The default value is "www.google.com".
 extern const char kGaiaHost[];
 
-// Specifies the backend server used for OAuth authentication requests.
-// The https:// prefix and the trailing slash should be
-// omitted. The default value is "www.google.com".
-extern const char kGaiaOAuthHost[];
-
-// Specifies the path prefix for GAIA OAuth URLs. It should be used
-// for testing in cases where authentication path prefix differs from the one
-// used in production.
-extern const char kGaiaOAuthUrlPath[];
-
 // Specifies the path prefix for GAIA authentication URL. It should be used
 // for testing in cases where authentication path prefix differs from the one
 // used in production.
diff --git a/google_apis/gaia/gaia_urls.cc b/google_apis/gaia/gaia_urls.cc
index aa5ac38..a7266d7 100644
--- a/google_apis/gaia/gaia_urls.cc
+++ b/google_apis/gaia/gaia_urls.cc
@@ -12,10 +12,6 @@ namespace {
 
 // Gaia service constants
 const char kDefaultGaiaBaseUrl[] = "accounts.google.com";
-
-// Gaia service constants
-const char kDefaultGaiaOAuthBaseUrl[] = "www.google.com";
-
 const char kCaptchaUrlPrefixSuffix[] = "/";
 const char kClientLoginUrlSuffix[] = "/ClientLogin";
 const char kServiceLoginUrlSuffix[] = "/ServiceLogin";
@@ -32,7 +28,7 @@ const char kOAuthRevokeTokenUrlSuffix[] = "/AuthSubRevokeToken";
 // Federated login constants
 const char kDefaultFederatedLoginHost[] = "www.google.com";
 const char kDefaultFederatedLoginPath[] = "/accounts";
-const char kGetOAuthTokenUrlSuffix[] = "/o8/GetOAuthToken";
+const char kGetOAuthTokenUrlSuffix[] = "/o/oauth/GetOAuthToken/";
 
 const char kClientLoginToOAuth2Url[] =
     "https://accounts.google.com/o/oauth2/programmatic_auth";
@@ -86,29 +82,7 @@ GaiaUrls::GaiaUrls() {
   get_user_info_url_ = gaia_url_base + kGetUserInfoUrlSuffix;
   token_auth_url_ = gaia_url_base + kTokenAuthUrlSuffix;
   merge_session_url_ = gaia_url_base + kMergeSessionUrlSuffix;
-
-  // Federated login is not part of Gaia and has its own endpoints.
-  std::string oauth_host_base;
-  GetSwitchValueWithDefault(switches::kGaiaOAuthHost,
-                            kDefaultFederatedLoginHost,
-                            &oauth_host_base);
-
-  std::string gaia_oauth_url_base = "https://"+oauth_host_base;
-  if (command_line->HasSwitch(switches::kGaiaOAuthUrlPath)) {
-    std::string path =
-        command_line->GetSwitchValueASCII(switches::kGaiaOAuthUrlPath);
-    if (!path.empty()) {
-      if (path[0] != '/')
-        gaia_oauth_url_base.append("/");
-
-      gaia_oauth_url_base.append(path);
-    }
-  } else {
-    gaia_oauth_url_base.append(kDefaultFederatedLoginPath);
-  }
-  get_oauth_token_url_ = gaia_oauth_url_base +
-                         kGetOAuthTokenUrlSuffix;
-
+  get_oauth_token_url_ = gaia_url_base + kGetOAuthTokenUrlSuffix;
   oauth_get_access_token_url_ = gaia_url_base +
                                 kOAuthGetAccessTokenUrlSuffix;
   oauth_wrap_bridge_url_ = gaia_url_base + kOAuthWrapBridgeUrlSuffix;