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

Unified Diff: content/browser/renderer_host/p2p/socket_host_tcp.cc

Issue 1545243002: Convert Pass()→std::move() in //content/browser (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
Index: content/browser/renderer_host/p2p/socket_host_tcp.cc
diff --git a/content/browser/renderer_host/p2p/socket_host_tcp.cc b/content/browser/renderer_host/p2p/socket_host_tcp.cc
index 3570847e8ba3624fff5b75968f32c1a0d5cb7e58..cd93a1293707231ecb120cd0ae7c12ee0ee3f066 100644
--- a/content/browser/renderer_host/p2p/socket_host_tcp.cc
+++ b/content/browser/renderer_host/p2p/socket_host_tcp.cc
@@ -5,6 +5,7 @@
#include "content/browser/renderer_host/p2p/socket_host_tcp.h"
#include <stddef.h>
+#include <utility>
#include "base/location.h"
#include "base/single_thread_task_runner.h"
@@ -156,9 +157,9 @@ void P2PSocketHostTcpBase::OnConnected(int result) {
state_ = STATE_TLS_CONNECTING;
StartTls();
} else if (IsPseudoTlsClientSocket(type_)) {
- scoped_ptr<net::StreamSocket> transport_socket = socket_.Pass();
+ scoped_ptr<net::StreamSocket> transport_socket = std::move(socket_);
socket_.reset(
- new jingle_glue::FakeSSLClientSocket(transport_socket.Pass()));
+ new jingle_glue::FakeSSLClientSocket(std::move(transport_socket)));
state_ = STATE_TLS_CONNECTING;
int status = socket_->Connect(
base::Bind(&P2PSocketHostTcpBase::ProcessTlsSslConnectDone,
@@ -181,7 +182,7 @@ void P2PSocketHostTcpBase::StartTls() {
scoped_ptr<net::ClientSocketHandle> socket_handle(
new net::ClientSocketHandle());
- socket_handle->SetSocket(socket_.Pass());
+ socket_handle->SetSocket(std::move(socket_));
net::SSLClientSocketContext context;
context.cert_verifier = url_context_->GetURLRequestContext()->cert_verifier();
@@ -208,7 +209,7 @@ void P2PSocketHostTcpBase::StartTls() {
DCHECK(socket_factory);
socket_ = socket_factory->CreateSSLClientSocket(
- socket_handle.Pass(), dest_host_port_pair, ssl_config, context);
+ std::move(socket_handle), dest_host_port_pair, ssl_config, context);
int status = socket_->Connect(
base::Bind(&P2PSocketHostTcpBase::ProcessTlsSslConnectDone,
base::Unretained(this)));

Powered by Google App Engine
This is Rietveld 408576698