Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(771)

Unified Diff: net/websockets/websocket_stream_create_test_base.cc

Issue 1545233002: Convert Pass()→std::move() in //net (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/websockets/websocket_stream.cc ('k') | net/websockets/websocket_stream_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/websockets/websocket_stream_create_test_base.cc
diff --git a/net/websockets/websocket_stream_create_test_base.cc b/net/websockets/websocket_stream_create_test_base.cc
index 5c0a2997851339c5a7a3cd9d0d464f628cb4675e..4211e1a485c2c6270e6205bcda20f020cad188cf 100644
--- a/net/websockets/websocket_stream_create_test_base.cc
+++ b/net/websockets/websocket_stream_create_test_base.cc
@@ -4,6 +4,8 @@
#include "net/websockets/websocket_stream_create_test_base.h"
+#include <utility>
+
#include "base/callback.h"
#include "base/macros.h"
#include "net/http/http_request_headers.h"
@@ -62,14 +64,14 @@ class WebSocketStreamCreateTestBase::TestConnectDelegate
scoped_ptr<WebSocketHandshakeRequestInfo> request) override {
// Can be called multiple times (in the case of HTTP auth). Last call
// wins.
- owner_->request_info_ = request.Pass();
+ owner_->request_info_ = std::move(request);
}
void OnFinishOpeningHandshake(
scoped_ptr<WebSocketHandshakeResponseInfo> response) override {
if (owner_->response_info_)
ADD_FAILURE();
- owner_->response_info_ = response.Pass();
+ owner_->response_info_ = std::move(response);
}
void OnSSLCertificateError(
@@ -77,7 +79,7 @@ class WebSocketStreamCreateTestBase::TestConnectDelegate
ssl_error_callbacks,
const SSLInfo& ssl_info,
bool fatal) override {
- owner_->ssl_error_callbacks_ = ssl_error_callbacks.Pass();
+ owner_->ssl_error_callbacks_ = std::move(ssl_error_callbacks);
owner_->ssl_info_ = ssl_info;
owner_->ssl_fatal_ = fatal;
}
@@ -111,10 +113,10 @@ void WebSocketStreamCreateTestBase::CreateAndConnectStream(
new DeterministicKeyWebSocketHandshakeStreamCreateHelper(delegate,
sub_protocols));
stream_request_ = CreateAndConnectStreamForTesting(
- GURL(socket_url), create_helper.Pass(), origin,
+ GURL(socket_url), std::move(create_helper), origin,
url_request_context_host_.GetURLRequestContext(), BoundNetLog(),
- connect_delegate.Pass(),
- timer ? timer.Pass()
+ std::move(connect_delegate),
+ timer ? std::move(timer)
: scoped_ptr<base::Timer>(new base::Timer(false, false)));
}
« no previous file with comments | « net/websockets/websocket_stream.cc ('k') | net/websockets/websocket_stream_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698