Convert Pass()→std::move() for iOS build.

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

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

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

6 files changed, 13 insertions, 11 deletions

diff --git a/net/disk_cache/blockfile/file_ios.cc b/net/disk_cache/blockfile/file_ios.cc
index d1d1919..b2a6d6e 100644
--- a/net/disk_cache/blockfile/file_ios.cc
+++ b/net/disk_cache/blockfile/file_ios.cc
@@ -8,6 +8,7 @@
 #include <stdint.h>
 
 #include <limits>
+#include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ -173,10 +174,7 @@ void DeleteFileInFlightIO() {
 namespace disk_cache {
 
 File::File(base::File file)
-    : init_(true),
-      mixed_(true),
-      base_file_(file.Pass()) {
-}
+    : init_(true), mixed_(true), base_file_(std::move(file)) {}
 
 bool File::Init(const base::FilePath& name) {
   if (base_file_.IsValid())
diff --git a/net/quic/test_tools/crypto_test_utils_chromium.cc b/net/quic/test_tools/crypto_test_utils_chromium.cc
index 249f193..babacef 100644
--- a/net/quic/test_tools/crypto_test_utils_chromium.cc
+++ b/net/quic/test_tools/crypto_test_utils_chromium.cc
@@ -249,7 +249,7 @@ ProofVerifier* ProofVerifierForTestingInternal(bool use_real_proof_verifier) {
       make_scoped_ptr(new MultiLogCTVerifier), "quic_root.crt");
 #else
   return new FakeProofVerifier(
-      cert_verifier.Pass(), make_scoped_ptr(new TransportSecurityState),
+      std::move(cert_verifier), make_scoped_ptr(new TransportSecurityState),
       make_scoped_ptr(new MultiLogCTVerifier), "quic_root.crt");
 #endif
 }
diff --git a/net/socket/client_socket_factory.cc b/net/socket/client_socket_factory.cc
index cc2a243..311f926 100644
--- a/net/socket/client_socket_factory.cc
+++ b/net/socket/client_socket_factory.cc
@@ -76,7 +76,7 @@ class DefaultClientSocketFactory : public ClientSocketFactory,
         std::move(transport_socket), host_and_port, ssl_config, context));
 #else
     return scoped_ptr<SSLClientSocket>(new SSLClientSocketNSS(
-        transport_socket.Pass(), host_and_port, ssl_config, context));
+        std::move(transport_socket), host_and_port, ssl_config, context));
 #endif
   }
 
diff --git a/net/socket/nss_ssl_util.cc b/net/socket/nss_ssl_util.cc
index 74b4d41..ee58757 100644
--- a/net/socket/nss_ssl_util.cc
+++ b/net/socket/nss_ssl_util.cc
@@ -11,6 +11,7 @@
 #include <sslproto.h>
 
 #include <string>
+#include <utility>
 
 #include "base/bind.h"
 #include "base/cpu.h"
@@ -87,7 +88,7 @@ scoped_ptr<base::Value> NetLogSSLErrorCallback(
   dict->SetInteger("net_error", net_error);
   if (ssl_lib_error)
     dict->SetInteger("ssl_lib_error", ssl_lib_error);
-  return dict.Pass();
+  return std::move(dict);
 }
 
 class NSSSSLInitSingleton {
@@ -388,7 +389,7 @@ scoped_ptr<base::Value> NetLogSSLFailedNSSFunctionCallback(
   if (param[0] != '\0')
     dict->SetString("param", param);
   dict->SetInteger("ssl_lib_error", ssl_lib_error);
-  return dict.Pass();
+  return std::move(dict);
 }
 
 void LogFailedNSSFunction(const BoundNetLog& net_log,
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc
index fcd8739..b15d761 100644
--- a/net/socket/ssl_client_socket_nss.cc
+++ b/net/socket/ssl_client_socket_nss.cc
@@ -63,6 +63,7 @@
 #include <algorithm>
 #include <limits>
 #include <map>
+#include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ -2359,7 +2360,7 @@ SSLClientSocketNSS::SSLClientSocketNSS(
     const HostPortPair& host_and_port,
     const SSLConfig& ssl_config,
     const SSLClientSocketContext& context)
-    : transport_(transport_socket.Pass()),
+    : transport_(std::move(transport_socket)),
       host_and_port_(host_and_port),
       ssl_config_(ssl_config),
       cert_verifier_(context.cert_verifier),
diff --git a/net/socket/ssl_server_socket_nss.cc b/net/socket/ssl_server_socket_nss.cc
index a676aa0..80450fe 100644
--- a/net/socket/ssl_server_socket_nss.cc
+++ b/net/socket/ssl_server_socket_nss.cc
@@ -4,6 +4,8 @@
 
 #include "net/socket/ssl_server_socket_nss.h"
 
+#include <utility>
+
 #if defined(OS_WIN)
 #include <winsock2.h>
 #endif
@@ -88,7 +90,7 @@ scoped_ptr<SSLServerSocket> CreateSSLServerSocket(
                                     << " called yet!";
 
   return scoped_ptr<SSLServerSocket>(
-      new SSLServerSocketNSS(socket.Pass(), cert, key, ssl_config));
+      new SSLServerSocketNSS(std::move(socket), cert, key, ssl_config));
 }
 
 SSLServerSocketNSS::SSLServerSocketNSS(
@@ -102,7 +104,7 @@ SSLServerSocketNSS::SSLServerSocketNSS(
       user_write_buf_len_(0),
       nss_fd_(NULL),
       nss_bufs_(NULL),
-      transport_socket_(transport_socket.Pass()),
+      transport_socket_(std::move(transport_socket)),
       ssl_config_(ssl_config),
       cert_(cert),
       key_(key.Copy()),