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;
+  if (command_line->HasSwitch(switches::kGaiaUrlPath)) {
+    std::string path = command_line->GetSwitchValueASCII(switches::kGaiaUrlPath);
+    if (!path.empty()) {
+      if (path[0] != '/')
+        gaia_origin_url_.append("/");
+
+      gaia_origin_url_.append(path);
+    }
+  }
+
   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;
@@ skipping 111 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_;
 }