WebSocket Mojo API: set reason when disconnecting a WebSocket interface because of insufficient res…

third_party/WebKit/Source/modules/websockets/WebSocketHandleImpl.cpp

 // 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 "modules/websockets/WebSocketHandleImpl.h"
 
 #include "modules/websockets/WebSocketHandleClient.h"
 #include "platform/network/NetworkLog.h"
 #include "platform/network/WebSocketHandshakeRequest.h"
 #include "platform/network/WebSocketHandshakeResponse.h"
@@ skipping 27 matching lines @@
         m_websocket->StartClosingHandshake(kAbnormalShutdownOpCode, emptyString());
 }
 
 void WebSocketHandleImpl::initialize(InterfaceProvider* interfaceProvider)
 {
     NETWORK_DVLOG(1) << this << " initialize(...)";
 
     DCHECK(!m_websocket);
     interfaceProvider->getInterface(mojo::GetProxy(&m_websocket));
 
-    m_websocket.set_connection_error_handler(
-        convertToBaseCallback(bind(&WebSocketHandleImpl::onConnectionError, unretained(this))));
+    m_websocket.set_connection_error_with_reason_handler(
+        convertToBaseCallback(WTF::bind(&WebSocketHandleImpl::onConnectionError, unretained(this))));
 }
 
 void WebSocketHandleImpl::connect(const KURL& url, const Vector<String>& protocols, SecurityOrigin* origin, const KURL& firstPartyForCookies, const String& userAgentOverride, WebSocketHandleClient* client)
 {
     DCHECK(m_websocket);
 
     NETWORK_DVLOG(1) << this << " connect(" << url.getString() << ", " << origin->toString() << ")";
 
     DCHECK(!m_client);
     DCHECK(client);
@@ skipping 55 matching lines @@
 
     m_websocket->StartClosingHandshake(code, reason.isNull() ? emptyString() : reason);
 }
 
 void WebSocketHandleImpl::disconnect()
 {
     m_websocket.reset();
     m_client = nullptr;
 }
 
-void WebSocketHandleImpl::onConnectionError()
+void WebSocketHandleImpl::onConnectionError(uint32_t customReason, const std::string& description)
 {
     if (!blink::Platform::current()) {
         // In the renderrer shutdown sequence, mojo channels are destructed and this
         // function is called. On the other hand, blink objects became invalid
         // *silently*, which means we must not touch |*client_| any more.
         // TODO(yhirano): Remove this code once the shutdown sequence is fixed.
         disconnect();
         return;
     }
 
     // Our connection to the WebSocket was dropped. This could be due to
     // exceeding the maximum number of concurrent websockets from this process.
-
-    // TODO(darin): Communicate a more specific error here (see crbug/634502).
-    OnFailChannel(
-        "Error in connection establishment: net:"
-        ":ERR_INSUFFICIENT_RESOURCES");
+    String failureMessage;
+    if (customReason == mojom::blink::WebSocket::kInsufficientResources) {
+        failureMessage = description.empty() ? "Insufficient resources" : String::fromUTF8(description.c_str(), description.size());
+    } else {
+        DCHECK(description.empty());
+        failureMessage = "Unspecified reason";
+    }
+    OnFailChannel(failureMessage);
 }
 
 void WebSocketHandleImpl::OnFailChannel(const String& message)
 {
     NETWORK_DVLOG(1) << this << " OnFailChannel(" << message << ")";
 
     WebSocketHandleClient* client = m_client;
     disconnect();
     if (!client)
         return;
@@ skipping 91 matching lines @@
 {
     NETWORK_DVLOG(1) << this << " OnClosingHandshake()";
     if (!m_client)
         return;
 
     m_client->didStartClosingHandshake(this);
     // |this| can be deleted here.
 }
 
 } // namespace blink