Fail WebSocket channel when handshake fails.

net/websockets/websocket_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_stream.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/http/http_request_headers.h"
 #include "net/http/http_status_code.h"
@@ skipping 52 matching lines @@
   // and so terminates the handshake if it is incomplete.
   virtual ~StreamRequestImpl() {}
 
   URLRequest* url_request() { return &url_request_; }
 
   void PerformUpgrade() {
     connect_delegate_->OnSuccess(create_helper_->stream()->Upgrade());
   }
 
   void ReportFailure() {
-    connect_delegate_->OnFailure(kWebSocketErrorAbnormalClosure);
+    std::string failure_message;
+    if (create_helper_->stream()) {
+      failure_message = create_helper_->stream()->GetFailureMessage();
+    } else {
+      switch (url_request_.status().status()) {

[tyoshino (SeeGerritForStatus), 2014/01/09 05:52:05]

how about listing all cases so that -Wswitch-enum can catch lack?

[yhirano, 2014/01/09 06:04:19]

Done.

+        case URLRequestStatus::CANCELED:
+          failure_message = "WebSocket opening handshake was canceled";
+          break;
+        case URLRequestStatus::FAILED:
+          failure_message =
+              std::string("Error in connection establishment: ") +
+              ErrorToString(url_request_.status().error());
+          break;
+        default:
+          break;
+      }
+    }
+    connect_delegate_->OnFailure(failure_message);
   }
 
  private:
   // |delegate_| needs to be declared before |url_request_| so that it gets
   // initialised first.
   scoped_ptr<Delegate> delegate_;
 
   // Deleting the StreamRequestImpl object deletes this URLRequest object,
   // cancelling the whole connection.
   URLRequest url_request_;
@@ skipping 106 matching lines @@
       scoped_ptr<WebSocketStream::ConnectDelegate> connect_delegate) {
   return CreateAndConnectStreamWithCreateHelper(socket_url,
                                                 create_helper.Pass(),
                                                 origin,
                                                 url_request_context,
                                                 net_log,
                                                 connect_delegate.Pass());
 }
 
 }  // namespace net