Index: ui/platform_window/android/platform_window_android.cc |
diff --git a/ui/platform_window/android/platform_window_android.cc b/ui/platform_window/android/platform_window_android.cc |
index b9ee051960584a63515a696ba1539c95002dec92..0cfdc6bf8504e06f67ff6fd03f1ec7e036572ff3 100644 |
--- a/ui/platform_window/android/platform_window_android.cc |
+++ b/ui/platform_window/android/platform_window_android.cc |
@@ -62,10 +62,11 @@ PlatformWindowAndroid::PlatformWindowAndroid(PlatformWindowDelegate* delegate) |
PlatformWindowAndroid::~PlatformWindowAndroid() { |
if (window_) |
ReleaseWindow(); |
- if (!java_platform_window_android_.is_empty()) { |
- JNIEnv* env = base::android::AttachCurrentThread(); |
- Java_PlatformWindowAndroid_detach( |
- env, java_platform_window_android_.get(env).obj()); |
+ JNIEnv* env = base::android::AttachCurrentThread(); |
+ ScopedJavaLocalRef<jobject> scoped_obj = |
+ java_platform_window_android_.get(env); |
+ if (!scoped_obj.is_null()) { |
+ Java_PlatformWindowAndroid_detach(env, scoped_obj.obj()); |
} |
} |