Clean up base::android::Init/GetApplicationContext()

base/android/jni_android.cc

 // Copyright (c) 2011 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 "base/android/jni_android.h"
 
 #include <map>
 
-#include "base/android/scoped_java_ref.h"
 #include "base/atomicops.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/threading/platform_thread.h"
 
 namespace {
 JavaVM* g_jvm = 0;
 jobject g_application_context = NULL;
 
 struct MethodIdentifier {
@@ skipping 28 matching lines @@
 base::subtle::AtomicWord g_method_id_map_lock = kUnlocked;
 
 }
 
 namespace base {
 namespace android {
 
 JNIEnv* AttachCurrentThread() {
   if (!g_jvm)
     return NULL;
-
   JNIEnv* env = NULL;
   jint ret = g_jvm->AttachCurrentThread(&env, NULL);
   DCHECK_EQ(ret, JNI_OK);
   return env;
 }
 
 void DetachFromVM() {
   // Ignore the return value, if the thread is not attached, DetachCurrentThread
   // will fail. But it is ok as the native thread may never be attached.
   if (g_jvm)
     g_jvm->DetachCurrentThread();
 }
 
 void InitVM(JavaVM* vm) {
   DCHECK(!g_jvm);
   g_jvm = vm;
 }
 
-void InitApplicationContext(jobject context) {
+void InitApplicationContext(const JavaRef<jobject>& context) {
   DCHECK(!g_application_context);
-  g_application_context = context;
+  g_application_context = context.env()->NewGlobalRef(context.obj());
 }
 
 jobject GetApplicationContext() {
   DCHECK(g_application_context);
   return g_application_context;
 }
 
 jmethodID GetMethodIDFromClassName(JNIEnv* env,
                                    const char* class_name,
                                    const char* method,
@@ skipping 72 matching lines @@
 bool CheckException(JNIEnv* env) {
   if (env->ExceptionCheck() == JNI_FALSE)
     return false;
   env->ExceptionDescribe();
   env->ExceptionClear();
   return true;
 }
 
 }  // namespace android
 }  // namespace base