Remove env() getter from JavaRef<>

content/browser/renderer_host/java/java_method.cc

 // Copyright (c) 2012 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 "content/browser/renderer_host/java/java_method.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/lazy_instance.h"
 #include "base/memory/singleton.h"
@@ skipping 77 matching lines @@
   NOTREACHED();
   return EmptyString();
 }
 
 }  // namespace
 
 JavaMethod::JavaMethod(const base::android::JavaRef<jobject>& method)
     : java_method_(method),
       have_calculated_num_parameters_(false),
       id_(NULL) {
-  JNIEnv* env = java_method_.env();
+  JNIEnv* env = AttachCurrentThread();
   // On construction, we do nothing except get the name. Everything else is
   // done lazily.
   ScopedJavaLocalRef<jstring> name(env, static_cast<jstring>(
       env->CallObjectMethod(java_method_.obj(), GetMethodIDFromClassName(
           env,
           kJavaLangReflectMethod,
           kGetName,
           kReturningJavaLangString))));
   name_ = ConvertJavaStringToUTF8(name);
 }
@@ skipping 23 matching lines @@
 
 void JavaMethod::EnsureNumParametersIsSetUp() const {
   if (have_calculated_num_parameters_) {
     return;
   }
   have_calculated_num_parameters_ = true;
 
   // The number of parameters will be used frequently when determining
   // whether to call this method. We don't get the ID etc until actually
   // required.
-  JNIEnv* env = java_method_.env();
+  JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jarray> parameters(env, static_cast<jarray>(
       env->CallObjectMethod(java_method_.obj(), GetMethodIDFromClassName(
           env,
           kJavaLangReflectMethod,
           kGetParameterTypes,
           kReturningJavaLangClassArray))));
   num_parameters_ = env->GetArrayLength(parameters.obj());
 }
 
 void JavaMethod::EnsureTypesAndIDAreSetUp() const {
   if (id_) {
     return;
   }
 
   // Get the parameters
-  JNIEnv* env = java_method_.env();
+  JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobjectArray> parameters(env, static_cast<jobjectArray>(
       env->CallObjectMethod(java_method_.obj(), GetMethodIDFromClassName(
           env,
           kJavaLangReflectMethod,
           kGetParameterTypes,
           kReturningJavaLangClassArray))));
   // Usually, this will already have been called.
   EnsureNumParametersIsSetUp();
   DCHECK_EQ(num_parameters_,
             static_cast<size_t>(env->GetArrayLength(parameters.obj())));
@@ skipping 56 matching lines @@
           env,
           kJavaLangReflectMethod,
           kGetDeclaringClass,
           kReturningJavaLangClass))));
   id_ = is_static ?
       GetStaticMethodID(env, declaring_class, name_.c_str(),
                         signature.c_str()) :
       GetMethodID(env, declaring_class, name_.c_str(), signature.c_str());
   java_method_.Reset();
 }