diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-14 17:41:05 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-04 12:37:36 +0000 |
commit | 399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (patch) | |
tree | 6b06b60ff365abef0e13b3503d593a0df48d20e8 /chromium/net/websockets/websocket_stream.cc | |
parent | 7366110654eec46f21b6824f302356426f48cd74 (diff) | |
download | qtwebengine-chromium-399c965b6064c440ddcf4015f5f8e9d131c7a0a6.tar.gz |
BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1
Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/net/websockets/websocket_stream.cc')
-rw-r--r-- | chromium/net/websockets/websocket_stream.cc | 52 |
1 files changed, 25 insertions, 27 deletions
diff --git a/chromium/net/websockets/websocket_stream.cc b/chromium/net/websockets/websocket_stream.cc index 6e6ae09d9b8..560cbad87b4 100644 --- a/chromium/net/websockets/websocket_stream.cc +++ b/chromium/net/websockets/websocket_stream.cc @@ -4,10 +4,11 @@ #include "net/websockets/websocket_stream.h" +#include <memory> #include <utility> #include "base/logging.h" -#include "base/memory/scoped_ptr.h" +#include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/sparse_histogram.h" #include "base/strings/stringprintf.h" @@ -85,8 +86,8 @@ class StreamRequestImpl : public WebSocketStreamRequest { const GURL& url, const URLRequestContext* context, const url::Origin& origin, - scoped_ptr<WebSocketStream::ConnectDelegate> connect_delegate, - scoped_ptr<WebSocketHandshakeStreamCreateHelper> create_helper) + std::unique_ptr<WebSocketStream::ConnectDelegate> connect_delegate, + std::unique_ptr<WebSocketHandshakeStreamCreateHelper> create_helper) : delegate_(new Delegate(this)), url_request_( context->CreateRequest(url, DEFAULT_PRIORITY, delegate_.get())), @@ -112,7 +113,7 @@ class StreamRequestImpl : public WebSocketStreamRequest { // and so terminates the handshake if it is incomplete. ~StreamRequestImpl() override {} - void Start(scoped_ptr<base::Timer> timer) { + void Start(std::unique_ptr<base::Timer> timer) { DCHECK(timer); base::TimeDelta timeout(base::TimeDelta::FromSeconds( kHandshakeTimeoutIntervalInSeconds)); @@ -187,13 +188,13 @@ class StreamRequestImpl : public WebSocketStreamRequest { private: // |delegate_| needs to be declared before |url_request_| so that it gets // initialised first. - scoped_ptr<Delegate> delegate_; + std::unique_ptr<Delegate> delegate_; // Deleting the StreamRequestImpl object deletes this URLRequest object, // cancelling the whole connection. - scoped_ptr<URLRequest> url_request_; + std::unique_ptr<URLRequest> url_request_; - scoped_ptr<WebSocketStream::ConnectDelegate> connect_delegate_; + std::unique_ptr<WebSocketStream::ConnectDelegate> connect_delegate_; // Owned by the URLRequest. WebSocketHandshakeStreamCreateHelper* create_helper_; @@ -202,7 +203,7 @@ class StreamRequestImpl : public WebSocketStreamRequest { std::string failure_message_; // A timer for handshake timeout. - scoped_ptr<base::Timer> timer_; + std::unique_ptr<base::Timer> timer_; }; class SSLErrorCallbacks : public WebSocketEventInterface::SSLErrorCallbacks { @@ -309,10 +310,9 @@ void Delegate::OnSSLCertificateError(URLRequest* request, const SSLInfo& ssl_info, bool fatal) { owner_->connect_delegate()->OnSSLCertificateError( - scoped_ptr<WebSocketEventInterface::SSLErrorCallbacks>( + std::unique_ptr<WebSocketEventInterface::SSLErrorCallbacks>( new SSLErrorCallbacks(request)), - ssl_info, - fatal); + ssl_info, fatal); } void Delegate::OnReadCompleted(URLRequest* request, int bytes_read) { @@ -328,33 +328,33 @@ WebSocketStream::~WebSocketStream() {} WebSocketStream::ConnectDelegate::~ConnectDelegate() {} -scoped_ptr<WebSocketStreamRequest> WebSocketStream::CreateAndConnectStream( +std::unique_ptr<WebSocketStreamRequest> WebSocketStream::CreateAndConnectStream( const GURL& socket_url, const std::vector<std::string>& requested_subprotocols, const url::Origin& origin, URLRequestContext* url_request_context, const BoundNetLog& net_log, - scoped_ptr<ConnectDelegate> connect_delegate) { - scoped_ptr<WebSocketHandshakeStreamCreateHelper> create_helper( + std::unique_ptr<ConnectDelegate> connect_delegate) { + std::unique_ptr<WebSocketHandshakeStreamCreateHelper> create_helper( new WebSocketHandshakeStreamCreateHelper(connect_delegate.get(), requested_subprotocols)); - scoped_ptr<StreamRequestImpl> request(new StreamRequestImpl( + std::unique_ptr<StreamRequestImpl> request(new StreamRequestImpl( socket_url, url_request_context, origin, std::move(connect_delegate), std::move(create_helper))); - request->Start(scoped_ptr<base::Timer>(new base::Timer(false, false))); + request->Start(std::unique_ptr<base::Timer>(new base::Timer(false, false))); return std::move(request); } // This is declared in websocket_test_util.h. -scoped_ptr<WebSocketStreamRequest> CreateAndConnectStreamForTesting( +std::unique_ptr<WebSocketStreamRequest> CreateAndConnectStreamForTesting( const GURL& socket_url, - scoped_ptr<WebSocketHandshakeStreamCreateHelper> create_helper, + std::unique_ptr<WebSocketHandshakeStreamCreateHelper> create_helper, const url::Origin& origin, URLRequestContext* url_request_context, const BoundNetLog& net_log, - scoped_ptr<WebSocketStream::ConnectDelegate> connect_delegate, - scoped_ptr<base::Timer> timer) { - scoped_ptr<StreamRequestImpl> request(new StreamRequestImpl( + std::unique_ptr<WebSocketStream::ConnectDelegate> connect_delegate, + std::unique_ptr<base::Timer> timer) { + std::unique_ptr<StreamRequestImpl> request(new StreamRequestImpl( socket_url, url_request_context, origin, std::move(connect_delegate), std::move(create_helper))); request->Start(std::move(timer)); @@ -368,12 +368,10 @@ void WebSocketDispatchOnFinishOpeningHandshake( base::Time response_time) { DCHECK(connect_delegate); if (headers.get()) { - connect_delegate->OnFinishOpeningHandshake(make_scoped_ptr( - new WebSocketHandshakeResponseInfo(url, - headers->response_code(), - headers->GetStatusText(), - headers, - response_time))); + connect_delegate->OnFinishOpeningHandshake( + base::WrapUnique(new WebSocketHandshakeResponseInfo( + url, headers->response_code(), headers->GetStatusText(), headers, + response_time))); } } |