Android: Remove unneeded RegisterNatives() calls

net/android/keystore_unittest.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 <openssl/bn.h>
 #include <openssl/dsa.h>
 #include <openssl/ecdsa.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/pem.h>
@@ skipping 40 matching lines @@
 // Finally, it also checks that using the EVP_PKEY generated with
 // GetOpenSSLPrivateKeyWrapper() works correctly.
 
 namespace net {
 namespace android {
 
 namespace {
 
 typedef base::android::ScopedJavaLocalRef<jobject> ScopedJava;
 
-JNIEnv* InitEnv() {
-  JNIEnv* env = base::android::AttachCurrentThread();
-  static bool inited = false;
-  if (!inited) {
-    RegisterNativesImpl(env);
-    inited = true;
-  }
-  return env;
-}
-
 // Returns true if running on an Android version older than 4.2
 bool IsOnAndroidOlderThan_4_2(void) {
   const int kAndroid42ApiLevel = 17;
   int level = base::android::BuildInfo::GetInstance()->sdk_int();
   return level < kAndroid42ApiLevel;
 }
 
 // Implements the callback expected by ERR_print_errors_cb().
 // used by GetOpenSSLErrorString below.
 int openssl_print_error_callback(const char* msg, size_t msglen, void* u) {
@@ skipping 83 matching lines @@
     LOG(ERROR) << "Could not load public key file: " << filename
                << ", " << GetOpenSSLErrorString();
     return NULL;
   }
   return pkey;
 }
 
 // Retrieve a JNI local ref from encoded PKCS#8 data.
 ScopedJava GetPKCS8PrivateKeyJava(PrivateKeyType key_type,
                                   const std::string& pkcs8_key) {
-  JNIEnv* env = InitEnv();
+  JNIEnv* env = base::android::AttachCurrentThread();
   base::android::ScopedJavaLocalRef<jbyteArray> bytes(
       base::android::ToJavaByteArray(
           env, reinterpret_cast<const uint8_t*>(pkcs8_key.data()),
           pkcs8_key.size()));
 
   ScopedJava key(
       Java_AndroidKeyStoreTestUtil_createPrivateKeyFromPKCS8(
           env, key_type, bytes.obj()));
 
   return key;
@@ skipping 216 matching lines @@
 
   result->assign(
       reinterpret_cast<const char*>(&wrapper_signature[0]),
       wrapper_signature.size());
 }
 
 }  // namespace
 
 TEST(AndroidKeyStore, GetRSAKeyModulus) {
   crypto::OpenSSLErrStackTracer err_trace(FROM_HERE);
-  InitEnv();
 
   // Load the test RSA key.
   crypto::ScopedEVP_PKEY pkey(ImportPrivateKeyFile(kTestRsaKeyFile));
   ASSERT_TRUE(pkey.get());
 
   // Convert it to encoded PKCS#8 bytes.
   std::string pkcs8_data;
   ASSERT_TRUE(GetPrivateKeyPkcs8Bytes(pkey, &pkcs8_data));
 
   // Create platform PrivateKey object from it.
@@ skipping 124 matching lines @@
   std::string signature;
   DoKeySigningWithWrapper(wrapper_key.get(),
                           openssl_key.get(),
                           message,
                           &signature);
   ASSERT_TRUE(VerifyTestECDSASignature(message, signature));
 }
 
 }  // namespace android
 }  // namespace net