Commit b75b7d00 authored by Bence Béky's avatar Bence Béky Committed by Commit Bot

Change WebSocketStreamRequestImpl::delegate_ type.

No need for this member to be unique_ptr<>.

Change-Id: I9d057c97332bff59b2765c63b696639ee040a14c
Reviewed-on: https://chromium-review.googlesource.com/1091958Reviewed-by: default avatarAdam Rice <ricea@chromium.org>
Commit-Queue: Bence Béky <bnc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#566022}
parent 0634da76
...@@ -113,10 +113,10 @@ class WebSocketStreamRequestImpl : public WebSocketStreamRequestAPI { ...@@ -113,10 +113,10 @@ class WebSocketStreamRequestImpl : public WebSocketStreamRequestAPI {
std::unique_ptr<WebSocketStream::ConnectDelegate> connect_delegate, std::unique_ptr<WebSocketStream::ConnectDelegate> connect_delegate,
std::unique_ptr<WebSocketHandshakeStreamCreateHelper> create_helper, std::unique_ptr<WebSocketHandshakeStreamCreateHelper> create_helper,
std::unique_ptr<WebSocketStreamRequestAPI> api_delegate) std::unique_ptr<WebSocketStreamRequestAPI> api_delegate)
: delegate_(std::make_unique<Delegate>(this)), : delegate_(this),
url_request_(context->CreateRequest(url, url_request_(context->CreateRequest(url,
DEFAULT_PRIORITY, DEFAULT_PRIORITY,
delegate_.get(), &delegate_,
kTrafficAnnotation)), kTrafficAnnotation)),
connect_delegate_(std::move(connect_delegate)), connect_delegate_(std::move(connect_delegate)),
handshake_stream_(nullptr), handshake_stream_(nullptr),
...@@ -285,7 +285,7 @@ class WebSocketStreamRequestImpl : public WebSocketStreamRequestAPI { ...@@ -285,7 +285,7 @@ class WebSocketStreamRequestImpl : public WebSocketStreamRequestAPI {
// |delegate_| needs to be declared before |url_request_| so that it gets // |delegate_| needs to be declared before |url_request_| so that it gets
// initialised first. // initialised first.
std::unique_ptr<Delegate> delegate_; Delegate delegate_;
// Deleting the WebSocketStreamRequestImpl object deletes this URLRequest // Deleting the WebSocketStreamRequestImpl object deletes this URLRequest
// object, cancelling the whole connection. // object, cancelling the whole connection.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment