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

net/android/keystore_openssl.cc

 // Copyright (c) 2013 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/android/keystore_openssl.h"
 
 #include <jni.h>
 #include <openssl/bn.h>
 #include <openssl/ec.h>
 #include <openssl/engine.h>
@@ skipping 333 matching lines @@
   ex_data->legacy_rsa = legacy_rsa;
   ex_data->cached_size = VectorBignumSize(modulus);
   RSA_set_ex_data(
       rsa.get(), global_boringssl_engine.Get().rsa_ex_index(), ex_data);
 
   crypto::ScopedEVP_PKEY pkey(EVP_PKEY_new());
   if (!pkey ||
       !EVP_PKEY_set1_RSA(pkey.get(), rsa.get())) {
     return crypto::ScopedEVP_PKEY();
   }
-  return pkey.Pass();
+  return pkey;
 }
 
 // On Android < 4.2, the libkeystore.so ENGINE uses CRYPTO_EX_DATA and is not
 // added to the global engine list. If all references to it are dropped, OpenSSL
 // will dlclose the module, leaving a dangling function pointer in the RSA
 // CRYPTO_EX_DATA class. To work around this, leak an extra reference to the
 // ENGINE we extract in GetRsaLegacyKey.
 //
 // In 4.2, this change avoids the problem:
 // https://android.googlesource.com/platform/libcore/+/106a8928fb4249f2f3d4dba1dddbe73ca5cb3d61
@@ skipping 154 matching lines @@
   ex_data->cached_size = VectorBignumSize(order);
 
   EC_KEY_set_ex_data(
       ec_key.get(), global_boringssl_engine.Get().ec_key_ex_index(), ex_data);
 
   crypto::ScopedEVP_PKEY pkey(EVP_PKEY_new());
   if (!pkey ||
       !EVP_PKEY_set1_EC_KEY(pkey.get(), ec_key.get())) {
     return crypto::ScopedEVP_PKEY();
   }
-  return pkey.Pass();
+  return pkey;
 }
 
 const ECDSA_METHOD android_ecdsa_method = {
     {
      0 /* references */,
      1 /* is_static */
     } /* common */,
     NULL /* app_data */,
 
     NULL /* init */,
@@ skipping 16 matching lines @@
       return GetEcdsaPkeyWrapper(private_key);
     default:
       LOG(WARNING)
           << "GetOpenSSLPrivateKeyWrapper() called with invalid key type";
       return nullptr;
   }
 }
 
 }  // namespace android
 }  // namespace net