Global conversion of Pass()→std::move() on OS==linux

❆(੭ु ◜◡‾)੭ु⁾☃❆

BUG=557422
R=avi@chromium.org
TBR=jam@chromium.org

Review URL: https://codereview.chromium.org/1550693002

Cr-Commit-Position: refs/heads/master@{#366956}

7 files changed, 21 insertions, 19 deletions

diff --git a/jingle/glue/chrome_async_socket.cc b/jingle/glue/chrome_async_socket.cc
index 6509f4c..52b35b52 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()));
diff --git a/jingle/glue/chrome_async_socket_unittest.cc b/jingle/glue/chrome_async_socket_unittest.cc
index 79fdb68..fd8193d 100644
--- a/jingle/glue/chrome_async_socket_unittest.cc
+++ b/jingle/glue/chrome_async_socket_unittest.cc
@@ -5,9 +5,9 @@
 #include "jingle/glue/chrome_async_socket.h"
 
 #include <stddef.h>
-
 #include <deque>
 #include <string>
+#include <utility>
 
 #include "base/logging.h"
 #include "base/macros.h"
@@ -137,7 +137,7 @@ class MockXmppClientSocketFactory : public ResolvingClientSocketFactory {
     context.cert_verifier = cert_verifier_.get();
     context.transport_security_state = transport_security_state_.get();
     return mock_client_socket_factory_->CreateSSLClientSocket(
-        transport_socket.Pass(), host_and_port, ssl_config_, context);
+        std::move(transport_socket), host_and_port, ssl_config_, context);
   }
 
  private:
@@ -161,7 +161,7 @@ class ChromeAsyncSocketTest
     // when called.
     // Explicitly create a MessagePumpDefault which can run in this enivronment.
     scoped_ptr<base::MessagePump> pump(new base::MessagePumpDefault());
-    message_loop_.reset(new base::MessageLoop(pump.Pass()));
+    message_loop_.reset(new base::MessageLoop(std::move(pump)));
   }
 
   ~ChromeAsyncSocketTest() override {}
diff --git a/jingle/glue/fake_ssl_client_socket.cc b/jingle/glue/fake_ssl_client_socket.cc
index 3284f8c..a61d359 100644
--- a/jingle/glue/fake_ssl_client_socket.cc
+++ b/jingle/glue/fake_ssl_client_socket.cc
@@ -6,8 +6,8 @@
 
 #include <stddef.h>
 #include <stdint.h>
-
 #include <cstdlib>
+#include <utility>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
@@ -81,7 +81,7 @@ base::StringPiece FakeSSLClientSocket::GetSslServerHello() {
 
 FakeSSLClientSocket::FakeSSLClientSocket(
     scoped_ptr<net::StreamSocket> transport_socket)
-    : transport_socket_(transport_socket.Pass()),
+    : transport_socket_(std::move(transport_socket)),
       next_handshake_state_(STATE_NONE),
       handshake_completed_(false),
       write_buf_(NewDrainableIOBufferWithSize(arraysize(kSslClientHello))),
diff --git a/jingle/glue/fake_ssl_client_socket_unittest.cc b/jingle/glue/fake_ssl_client_socket_unittest.cc
index c3d64fd..50f7457 100644
--- a/jingle/glue/fake_ssl_client_socket_unittest.cc
+++ b/jingle/glue/fake_ssl_client_socket_unittest.cc
@@ -6,8 +6,8 @@
 
 #include <stddef.h>
 #include <stdint.h>
-
 #include <algorithm>
+#include <utility>
 #include <vector>
 
 #include "base/macros.h"
@@ -291,7 +291,7 @@ TEST_F(FakeSSLClientSocketTest, PassThroughMethods) {
   EXPECT_CALL(*mock_client_socket, SetOmniboxSpeculation());
 
   // Takes ownership of |mock_client_socket|.
-  FakeSSLClientSocket fake_ssl_client_socket(mock_client_socket.Pass());
+  FakeSSLClientSocket fake_ssl_client_socket(std::move(mock_client_socket));
   fake_ssl_client_socket.SetReceiveBufferSize(kReceiveBufferSize);
   fake_ssl_client_socket.SetSendBufferSize(kSendBufferSize);
   EXPECT_EQ(kPeerAddress,
diff --git a/jingle/glue/thread_wrapper.cc b/jingle/glue/thread_wrapper.cc
index b035dbe..5dcf996 100644
--- a/jingle/glue/thread_wrapper.cc
+++ b/jingle/glue/thread_wrapper.cc
@@ -51,7 +51,7 @@ scoped_ptr<JingleThreadWrapper> JingleThreadWrapper::WrapTaskRunner(
 
   scoped_ptr<JingleThreadWrapper> result(new JingleThreadWrapper(task_runner));
   g_jingle_thread_wrapper.Get().Set(result.get());
-  return result.Pass();
+  return result;
 }
 
 // static
diff --git a/jingle/glue/xmpp_client_socket_factory.cc b/jingle/glue/xmpp_client_socket_factory.cc
index 4f7ac4c..8255aa3 100644
--- a/jingle/glue/xmpp_client_socket_factory.cc
+++ b/jingle/glue/xmpp_client_socket_factory.cc
@@ -4,6 +4,8 @@
 
 #include "jingle/glue/xmpp_client_socket_factory.h"
 
+#include <utility>
+
 #include "base/logging.h"
 #include "jingle/glue/fake_ssl_client_socket.h"
 #include "jingle/glue/proxy_resolving_client_socket.h"
@@ -39,10 +41,10 @@ XmppClientSocketFactory::CreateTransportClientSocket(
           request_context_getter_,
           ssl_config_,
           host_and_port));
-  return (use_fake_ssl_client_socket_ ?
-          scoped_ptr<net::StreamSocket>(
-              new FakeSSLClientSocket(transport_socket.Pass())) :
-          transport_socket.Pass());
+  return (use_fake_ssl_client_socket_
+              ? scoped_ptr<net::StreamSocket>(
+                    new FakeSSLClientSocket(std::move(transport_socket)))
+              : std::move(transport_socket));
 }
 
 scoped_ptr<net::SSLClientSocket>
@@ -58,7 +60,7 @@ XmppClientSocketFactory::CreateSSLClientSocket(
   // TODO(rkn): context.channel_id_service is NULL because the
   // ChannelIDService class is not thread safe.
   return client_socket_factory_->CreateSSLClientSocket(
-      transport_socket.Pass(), host_and_port, ssl_config_, context);
+      std::move(transport_socket), host_and_port, ssl_config_, context);
 }
 
 
diff --git a/jingle/notifier/base/xmpp_connection_unittest.cc b/jingle/notifier/base/xmpp_connection_unittest.cc
index 56afc48..0e8266f 100644
--- a/jingle/notifier/base/xmpp_connection_unittest.cc
+++ b/jingle/notifier/base/xmpp_connection_unittest.cc
@@ -5,6 +5,7 @@
 #include "jingle/notifier/base/xmpp_connection.h"
 
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
@@ -76,7 +77,7 @@ class XmppConnectionTest : public testing::Test {
   XmppConnectionTest()
       : mock_pre_xmpp_auth_(new MockPreXmppAuth()) {
     scoped_ptr<base::MessagePump> pump(new base::MessagePumpDefault());
-    message_loop_.reset(new base::MessageLoop(pump.Pass()));
+    message_loop_.reset(new base::MessageLoop(std::move(pump)));
 
     url_request_context_getter_ = new net::TestURLRequestContextGetter(
         message_loop_->task_runner());