Add blink::WebSocketHandshakeThrottle

third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannel.h

Index: third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannel.h
diff --git a/third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannel.h b/third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannel.h
index d779151e0ce0faff1954ec10d93a527708c93b0f..46242d5f1dbb73078b888f4bb9c205c379fa4609 100644
--- a/third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannel.h
+++ b/third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannel.h
@@ -33,6 +33,7 @@
 
 #include <stdint.h>
 #include <memory>
+#include <utility>
 #include "bindings/core/v8/SourceLocation.h"
 #include "core/fileapi/Blob.h"
 #include "core/fileapi/FileError.h"
@@ -50,17 +51,20 @@
 #include "platform/wtf/Vector.h"
 #include "platform/wtf/text/CString.h"
 #include "platform/wtf/text/WTFString.h"
+#include "public/platform/WebCallbacks.h"
 
 namespace blink {
 
 class ThreadableLoadingContext;
 class WebSocketHandshakeRequest;
+class WebSocketHandshakeThrottle;
 
 // This class is a WebSocketChannel subclass that works with a Document in a
 // DOMWindow (i.e. works in the main thread).
 class MODULES_EXPORT DocumentWebSocketChannel final
     : public WebSocketChannel,
-      public WebSocketHandleClient {
+      public WebSocketHandleClient,
+      public WebCallbacks<void, const WebString&> {
  public:
   // You can specify the source file and the line number information
   // explicitly by passing the last parameter.
@@ -76,14 +80,17 @@ class MODULES_EXPORT DocumentWebSocketChannel final
     return Create(ThreadableLoadingContext::Create(*document), client,
                   std::move(location), handle);
   }
-  static DocumentWebSocketChannel* Create(
-      ThreadableLoadingContext* loading_context,
-      WebSocketChannelClient* client,
-      std::unique_ptr<SourceLocation> location,
-      WebSocketHandle* handle = 0) {
-    return new DocumentWebSocketChannel(loading_context, client,
-                                        std::move(location), handle);
-  }
+  static DocumentWebSocketChannel* Create(ThreadableLoadingContext*,
+                                          WebSocketChannelClient*,
+                                          std::unique_ptr<SourceLocation>,
+                                          WebSocketHandle* = 0);

[yhirano, 2017/06/13 09:14:39]

ditto

[Adam Rice, 2017/06/13 12:53:42]

Done.

+  static DocumentWebSocketChannel* CreateForTesting(
+      Document*,
+      WebSocketChannelClient*,
+      std::unique_ptr<SourceLocation>,
+      WebSocketHandle*,
+      std::unique_ptr<WebSocketHandshakeThrottle>);
+
   ~DocumentWebSocketChannel() override;
 
   // WebSocketChannel functions.
@@ -108,6 +115,7 @@ class MODULES_EXPORT DocumentWebSocketChannel final
  private:
   class BlobLoader;
   class Message;
+  struct ConnectInfo;
 
   enum MessageType {
     kMessageTypeText,
@@ -126,7 +134,9 @@ class MODULES_EXPORT DocumentWebSocketChannel final
   DocumentWebSocketChannel(ThreadableLoadingContext*,
                            WebSocketChannelClient*,
                            std::unique_ptr<SourceLocation>,
-                           WebSocketHandle*);
+                           WebSocketHandle*,
+                           std::unique_ptr<WebSocketHandshakeThrottle>);
+
   void SendInternal(WebSocketHandle::MessageType,
                     const char* data,
                     size_t total_size,
@@ -167,6 +177,11 @@ class MODULES_EXPORT DocumentWebSocketChannel final
   void DidReceiveFlowControl(WebSocketHandle*, int64_t quota) override;
   void DidStartClosingHandshake(WebSocketHandle*) override;
 
+  // WebCallbacks<void, const WebString&> functions. These are called with the
+  // results of throttling.
+  void OnSuccess() override;
+  void OnError(const WebString& console_message) override;
+
   // Methods for BlobLoader.
   void DidFinishLoadingBlob(DOMArrayBuffer*);
   void DidFailLoadingBlob(FileError::ErrorCode);
@@ -198,6 +213,11 @@ class MODULES_EXPORT DocumentWebSocketChannel final
 
   std::unique_ptr<SourceLocation> location_at_construction_;
   RefPtr<WebSocketHandshakeRequest> handshake_request_;
+  std::unique_ptr<WebSocketHandshakeThrottle> handshake_throttle_;
+  // This field is only initialised if the object is still waiting for a
+  // throttle response when DidConnect is called.
+  std::unique_ptr<ConnectInfo> connect_info_;
+  bool throttle_passed_;
 
   static const uint64_t kReceivedDataSizeForFlowControlHighWaterMark = 1 << 15;
 };