Index: base/android/jni_android.cc |
diff --git a/base/android/jni_android.cc b/base/android/jni_android.cc |
index 3db0fc8be8ce9bb3cb6477fab01bbc2ffdc8b016..d836744cb868b97221d732db84735f326137315f 100644 |
--- a/base/android/jni_android.cc |
+++ b/base/android/jni_android.cc |
@@ -20,10 +20,6 @@ using base::android::ScopedJavaLocalRef; |
bool g_disable_manual_jni_registration = false; |
JavaVM* g_jvm = NULL; |
-// Leak the global app context, as it is used from a non-joinable worker thread |
-// that may still be running at shutdown. There is no harm in doing this. |
-base::LazyInstance<base::android::ScopedJavaGlobalRef<jobject> >::Leaky |
- g_application_context = LAZY_INSTANCE_INITIALIZER; |
base::LazyInstance<base::android::ScopedJavaGlobalRef<jobject> >::Leaky |
g_class_loader = LAZY_INSTANCE_INITIALIZER; |
jmethodID g_class_loader_load_class_method_id = 0; |
@@ -78,15 +74,6 @@ bool IsVMInitialized() { |
return g_jvm != NULL; |
} |
-void InitApplicationContext(JNIEnv* env, const JavaRef<jobject>& context) { |
- if (env->IsSameObject(g_application_context.Get().obj(), context.obj())) { |
- // It's safe to set the context more than once if it's the same context. |
- return; |
- } |
- DCHECK(g_application_context.Get().is_null()); |
- g_application_context.Get().Reset(context); |
-} |
- |
void InitReplacementClassLoader(JNIEnv* env, |
const JavaRef<jobject>& class_loader) { |
DCHECK(g_class_loader.Get().is_null()); |
@@ -105,11 +92,6 @@ void InitReplacementClassLoader(JNIEnv* env, |
g_class_loader.Get().Reset(class_loader); |
} |
-const jobject GetApplicationContext() { |
- DCHECK(!g_application_context.Get().is_null()); |
- return g_application_context.Get().obj(); |
-} |
- |
ScopedJavaLocalRef<jclass> GetClass(JNIEnv* env, const char* class_name) { |
jclass clazz; |
if (!g_class_loader.Get().is_null()) { |