Revert 282307 "Map WebSocket URL schemes to HTTP URL schemes for..."

> Map WebSocket URL schemes to HTTP URL schemes for auth purposes.
> 
> This permits WebSocket connections to inherit credentials from HTTP pages, and
> matches the behaviour of other browsers.
> 
> Design doc: https://docs.google.com/a/chromium.org/document/d/129rLtf5x3hvhP5rayLiSxnEjOXS8Z7EnLJgBL4CdwjI/edit
> 
> Also consider any 401 or 407 results that reach the WebSocketStream
> URLRequest::Delegate to be unrecoverable errors.
> 
> Also ensure that the response headers are reported back to the renderer
> when the developer tools are open and a 401 error happens.
> 
> BUG=123862
> 
> Review URL: https://codereview.chromium.org/336263005

Seems to cause WebSocket1 failure in WinXP

TBR=ricea@chromium.org

Review URL: https://codereview.chromium.org/388493002

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

1 files changed, 0 insertions, 12 deletions

diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index 8ee9069..f4df073 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -61,7 +61,6 @@
 #include "net/ssl/ssl_cert_request_info.h"
 #include "net/ssl/ssl_connection_status_flags.h"
 #include "url/gurl.h"
-#include "url/url_canon.h"
 
 #if defined(SPDY_PROXY_AUTH_ORIGIN)
 #include <algorithm>
@@ -1546,17 +1545,6 @@ GURL HttpNetworkTransaction::AuthURL(HttpAuth::Target target) const {
                   proxy_info_.proxy_server().host_port_pair().ToString());
     }
     case HttpAuth::AUTH_SERVER:
-      if (ForWebSocketHandshake()) {
-        const GURL& url = request_->url;
-        url::Replacements<char> ws_to_http;
-        if (url.SchemeIs("ws")) {
-          ws_to_http.SetScheme("http", url::Component(0, 4));
-        } else {
-          DCHECK(url.SchemeIs("wss"));
-          ws_to_http.SetScheme("https", url::Component(0, 5));
-        }
-        return url.ReplaceComponents(ws_to_http);
-      }
       return request_->url;
     default:
      return GURL();