Added chrome switch that lets tests override URL path, moved GAIA auth extension from CrOS

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 {
@@ skipping 45 matching lines @@
   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;
+  std::string gaia_url_base = gaia_origin_url_;
+  if (command_line->HasSwitch(switches::kGaiaUrlPath)) {
+    std::string path =
+        command_line->GetSwitchValueASCII(switches::kGaiaUrlPath);
+    if (!path.empty()) {
+      if (path[0] != '/')
+        gaia_url_base.append("/");
+
+      gaia_url_base.append(path);
+    }
+  }
+
+  client_login_url_ = gaia_url_base + kClientLoginUrlSuffix;
+  service_login_url_ = gaia_url_base + kServiceLoginUrlSuffix;
+  issue_auth_token_url_ = gaia_url_base + kIssueAuthTokenUrlSuffix;
+  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.
   get_oauth_token_url_ = std::string(kDefaultFederatedLoginBaseUrl) +
                          kGetOAuthTokenUrlSuffix;
 
-  oauth_get_access_token_url_ = gaia_origin_url_ +
+  oauth_get_access_token_url_ = gaia_url_base +
                                 kOAuthGetAccessTokenUrlSuffix;
-  oauth_wrap_bridge_url_ = gaia_origin_url_ + kOAuthWrapBridgeUrlSuffix;
-  oauth_revoke_token_url_ = gaia_origin_url_ + kOAuthRevokeTokenUrlSuffix;
-  oauth1_login_url_ = gaia_origin_url_ + kOAuth1LoginUrlSuffix;
+  oauth_wrap_bridge_url_ = gaia_url_base + kOAuthWrapBridgeUrlSuffix;
+  oauth_revoke_token_url_ = gaia_url_base + kOAuthRevokeTokenUrlSuffix;
+  oauth1_login_url_ = gaia_url_base + 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";
   oauth_user_info_url_ = "https://www.googleapis.com/oauth2/v1/userinfo";
   oauth_wrap_bridge_user_info_scope_ =
       "https://www.googleapis.com/auth/userinfo.email";
   client_oauth_url_ = "https://accounts.google.com/ClientOAuth";
 
@@ skipping 95 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_;
 }