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

Unified Diff: jingle/glue/chrome_async_socket.cc

Issue 1550693002: Global conversion of Pass()→std::move() on Linux (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 | « ipc/mojo/ipc_mojo_message_helper.cc ('k') | jingle/glue/chrome_async_socket_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: jingle/glue/chrome_async_socket.cc
diff --git a/jingle/glue/chrome_async_socket.cc b/jingle/glue/chrome_async_socket.cc
index 6509f4c5fc9c666c342678bc2c3e6781035fe3d2..52b35b52f3a1506580601cce0f41afb26ae69e3f 100644
--- a/jingle/glue/chrome_async_socket.cc
+++ b/jingle/glue/chrome_async_socket.cc
@@ -5,10 +5,10 @@
#include "jingle/glue/chrome_async_socket.h"
#include <stddef.h>
-
#include <algorithm>
#include <cstdlib>
#include <cstring>
+#include <utility>
#include "base/bind.h"
#include "base/compiler_specific.h"
@@ -405,10 +405,9 @@ bool ChromeAsyncSocket::StartTls(const std::string& domain_name) {
DCHECK(transport_socket_.get());
scoped_ptr<net::ClientSocketHandle> socket_handle(
new net::ClientSocketHandle());
- socket_handle->SetSocket(transport_socket_.Pass());
- transport_socket_ =
- resolving_client_socket_factory_->CreateSSLClientSocket(
- socket_handle.Pass(), net::HostPortPair(domain_name, 443));
+ socket_handle->SetSocket(std::move(transport_socket_));
+ transport_socket_ = resolving_client_socket_factory_->CreateSSLClientSocket(
+ std::move(socket_handle), net::HostPortPair(domain_name, 443));
int status = transport_socket_->Connect(
base::Bind(&ChromeAsyncSocket::ProcessSSLConnectDone,
weak_ptr_factory_.GetWeakPtr()));
« no previous file with comments | « ipc/mojo/ipc_mojo_message_helper.cc ('k') | jingle/glue/chrome_async_socket_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698