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

trunk/src/net/websockets/websocket_basic_handshake_stream.cc

 // Copyright 2013 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 "net/websockets/websocket_basic_handshake_stream.h"
 
 #include <algorithm>
 #include <iterator>
 #include <set>
 #include <string>
@@ skipping 521 matching lines @@
   handshake_challenge_for_testing_.reset(new std::string(key));
 }
 
 void WebSocketBasicHandshakeStream::ReadResponseHeadersCallback(
     const CompletionCallback& callback,
     int result) {
   callback.Run(ValidateResponse(result));
 }
 
 void WebSocketBasicHandshakeStream::OnFinishOpeningHandshake() {
+  DCHECK(connect_delegate_);
   DCHECK(http_response_info_);
-  WebSocketDispatchOnFinishOpeningHandshake(connect_delegate_,
-                                            url_,
-                                            http_response_info_->headers,
-                                            http_response_info_->response_time);
+  scoped_refptr<HttpResponseHeaders> headers = http_response_info_->headers;
+  // If the headers are too large, HttpStreamParser will just not parse them at
+  // all.
+  if (headers) {
+    scoped_ptr<WebSocketHandshakeResponseInfo> response(
+        new WebSocketHandshakeResponseInfo(url_,
+                                           headers->response_code(),
+                                           headers->GetStatusText(),
+                                           headers,
+                                           http_response_info_->response_time));
+    connect_delegate_->OnFinishOpeningHandshake(response.Pass());
+  }
 }
 
 int WebSocketBasicHandshakeStream::ValidateResponse(int rv) {
   DCHECK(http_response_info_);
   // Most net errors happen during connection, so they are not seen by this
   // method. The histogram for error codes is created in
   // Delegate::OnResponseStarted in websocket_stream.cc instead.
   if (rv >= 0) {
     const HttpResponseHeaders* headers = http_response_info_->headers.get();
     const int response_code = headers->response_code();
@@ skipping 61 matching lines @@
   set_failure_message("Error during WebSocket handshake: " + failure_message);
   return ERR_INVALID_RESPONSE;
 }
 
 void WebSocketBasicHandshakeStream::set_failure_message(
     const std::string& failure_message) {
   *failure_message_ = failure_message;
 }
 
 }  // namespace net