Null check ContentViewCore::GetJavaObject

android_webview/native/external_video_surface_container_impl.cc

 // Copyright 2014 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 "android_webview/native/external_video_surface_container_impl.h"
 
 #include "base/android/jni_android.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "jni/ExternalVideoSurfaceContainer_jni.h"
 #include "ui/gfx/geometry/rect_f.h"
 
 using base::android::AttachCurrentThread;
 using content::ContentViewCore;
 
 namespace android_webview {
 
-ExternalVideoSurfaceContainerImpl::ExternalVideoSurfaceContainerImpl(
+// static
+ExternalVideoSurfaceContainerImpl* ExternalVideoSurfaceContainerImpl::Create(
     content::WebContents* web_contents) {
   ContentViewCore* cvc = ContentViewCore::FromWebContents(web_contents);
-  if (cvc) {
-    JNIEnv* env = AttachCurrentThread();
-    jobject_.Reset(
-        Java_ExternalVideoSurfaceContainer_create(
-            env, reinterpret_cast<intptr_t>(this), cvc->GetJavaObject().obj()));
-  }
+  if (!cvc)
+    return nullptr;
+  base::android::ScopedJavaLocalRef<jobject> jcvc = cvc->GetJavaObject();
+  if (jcvc.is_null())
+    return nullptr;
+  return new ExternalVideoSurfaceContainerImpl(jcvc);
+}
+
+ExternalVideoSurfaceContainerImpl::ExternalVideoSurfaceContainerImpl(
+    base::android::ScopedJavaLocalRef<jobject> java_content_view_core) {
+  JNIEnv* env = AttachCurrentThread();
+  jobject_.Reset(Java_ExternalVideoSurfaceContainer_create(
+      env, reinterpret_cast<intptr_t>(this), java_content_view_core.obj()));
 }
 
 ExternalVideoSurfaceContainerImpl::~ExternalVideoSurfaceContainerImpl() {
   JNIEnv* env = AttachCurrentThread();
   Java_ExternalVideoSurfaceContainer_destroy(env, jobject_.obj());
   jobject_.Reset();
 }
 
 void ExternalVideoSurfaceContainerImpl::RequestExternalVideoSurface(
     int player_id,
@@ skipping 59 matching lines @@
     JNIEnv* env, jobject obj, jint player_id) {
   if (!surface_destroyed_cb_.is_null())
     surface_destroyed_cb_.Run(static_cast<int>(player_id));
 }
 
 bool RegisterExternalVideoSurfaceContainer(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android_webview