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

net/ssl/ssl_platform_key_android.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/ssl/ssl_platform_key.h"
 
 #include <openssl/digest.h>
 #include <openssl/evp.h>
+#include <utility>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "crypto/scoped_openssl_types.h"
 #include "net/base/net_errors.h"
 #include "net/ssl/openssl_client_key_store.h"
 #include "net/ssl/ssl_platform_key_task_runner.h"
 #include "net/ssl/ssl_private_key.h"
 #include "net/ssl/threaded_ssl_private_key.h"
 
 namespace net {
 
 namespace {
 
 class SSLPlatformKeyAndroid : public ThreadedSSLPrivateKey::Delegate {
  public:
   SSLPlatformKeyAndroid(crypto::ScopedEVP_PKEY key, SSLPrivateKey::Type type)
-      : key_(key.Pass()), type_(type) {}
+      : key_(std::move(key)), type_(type) {}
 
   ~SSLPlatformKeyAndroid() override {}
 
   SSLPrivateKey::Type GetType() override { return type_; }
 
   std::vector<SSLPrivateKey::Hash> GetDigestPreferences() override {
     static const SSLPrivateKey::Hash kHashes[] = {
         SSLPrivateKey::Hash::SHA512, SSLPrivateKey::Hash::SHA384,
         SSLPrivateKey::Hash::SHA256, SSLPrivateKey::Hash::SHA1};
     return std::vector<SSLPrivateKey::Hash>(kHashes,
@@ skipping 75 matching lines @@
       type = SSLPrivateKey::Type::RSA;
       break;
     case EVP_PKEY_EC:
       type = SSLPrivateKey::Type::ECDSA;
       break;
     default:
       LOG(ERROR) << "Unknown key type: " << EVP_PKEY_id(key.get());
       return nullptr;
   }
   return make_scoped_refptr(new ThreadedSSLPrivateKey(
-      make_scoped_ptr(new SSLPlatformKeyAndroid(key.Pass(), type)),
+      make_scoped_ptr(new SSLPlatformKeyAndroid(std::move(key), type)),
       GetSSLPlatformKeyTaskRunner()));
 }
 
 }  // namespace
 
 scoped_refptr<SSLPrivateKey> FetchClientCertPrivateKey(
     X509Certificate* certificate) {
   crypto::ScopedEVP_PKEY key =
       OpenSSLClientKeyStore::GetInstance()->FetchClientCertPrivateKey(
           certificate);
-  return WrapOpenSSLPrivateKey(key.Pass());
+  return WrapOpenSSLPrivateKey(std::move(key));
 }
 
 }  // namespace net