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

trunk/src/net/websockets/websocket_stream.cc

Index: trunk/src/net/websockets/websocket_stream.cc
===================================================================
--- trunk/src/net/websockets/websocket_stream.cc	(revision 282330)
+++ trunk/src/net/websockets/websocket_stream.cc	(working copy)
@@ -10,7 +10,6 @@
 #include "base/metrics/sparse_histogram.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_request_headers.h"
-#include "net/http/http_response_headers.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
@@ -134,20 +133,9 @@
           break;
       }
     }
-    ReportFailureWithMessage(failure_message_);
+    connect_delegate_->OnFailure(failure_message_);
   }
 
-  void ReportFailureWithMessage(const std::string& failure_message) {
-    connect_delegate_->OnFailure(failure_message);
-  }
-
-  void OnFinishOpeningHandshake() {
-    WebSocketDispatchOnFinishOpeningHandshake(connect_delegate(),
-                                              url_request_.url(),
-                                              url_request_.response_headers(),
-                                              url_request_.response_time());
-  }
-
   WebSocketStream::ConnectDelegate* connect_delegate() const {
     return connect_delegate_.get();
   }
@@ -210,16 +198,7 @@
       return;
 
     case HTTP_UNAUTHORIZED:
-      result_ = FAILED;
-      owner_->OnFinishOpeningHandshake();
-      owner_->ReportFailureWithMessage(
-          "HTTP Authentication failed; no valid credentials available");
-      return;
-
     case HTTP_PROXY_AUTHENTICATION_REQUIRED:
-      result_ = FAILED;
-      owner_->OnFinishOpeningHandshake();
-      owner_->ReportFailureWithMessage("Proxy authentication failed");
       return;
 
     default:
@@ -306,20 +285,4 @@
   return request.PassAs<WebSocketStreamRequest>();
 }
 
-void WebSocketDispatchOnFinishOpeningHandshake(
-    WebSocketStream::ConnectDelegate* connect_delegate,
-    const GURL& url,
-    const scoped_refptr<HttpResponseHeaders>& headers,
-    base::Time response_time) {
-  DCHECK(connect_delegate);
-  if (headers) {
-    connect_delegate->OnFinishOpeningHandshake(make_scoped_ptr(
-        new WebSocketHandshakeResponseInfo(url,
-                                           headers->response_code(),
-                                           headers->GetStatusText(),
-                                           headers,
-                                           response_time)));
-  }
-}
-
 }  // namespace net