Refactor ContentViewClient (1/6)

content/browser/android/content_video_view.cc

Index: content/browser/android/content_video_view.cc
diff --git a/content/browser/android/content_video_view.cc b/content/browser/android/content_video_view.cc
index 9b919e8bf31a365e36f700aef1e5741e0c5d6719..b5e9a6fc0bee5c78b5d9349f267f52f7d3db1b3b 100644
--- a/content/browser/android/content_video_view.cc
+++ b/content/browser/android/content_video_view.cc
@@ -16,6 +16,7 @@
 using base::android::AttachCurrentThread;
 using base::android::CheckException;
 using base::android::JavaParamRef;
+using base::android::JavaRef;
 using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
 using base::UserMetricsAction;
@@ -49,11 +50,12 @@ ContentVideoView* ContentVideoView::GetInstance() {
 
 ContentVideoView::ContentVideoView(Client* client,
                                    ContentViewCore* content_view_core,
+                                   const JavaRef<jobject>& video_embedder,
                                    const gfx::Size& video_natural_size)
     : client_(client), weak_factory_(this) {
   DCHECK(!g_content_video_view);
   j_content_video_view_ =
-      CreateJavaObject(content_view_core, video_natural_size);
+      CreateJavaObject(content_view_core, video_embedder, video_natural_size);
   g_content_video_view = this;
 }
 
@@ -162,16 +164,19 @@ void ContentVideoView::RecordExitFullscreenPlayback(
 
 JavaObjectWeakGlobalRef ContentVideoView::CreateJavaObject(

[boliu, 2016/09/26 21:25:24]

issue with existing code, so doesn't need to be fixed here

this is broken. afaict nothing is keeping a strong ref to this (during creation
at least), so this could get collected at any time

[Jinsuk Kim, 2016/09/27 10:08:58]

Acknowledged. I'll leave a TODO for a reminder before landing.

     ContentViewCore* content_view_core,
+    const JavaRef<jobject>& j_content_video_view_embedder,
     const gfx::Size& video_natural_size) {
   JNIEnv* env = AttachCurrentThread();
   base::android::ScopedJavaLocalRef<jobject> j_content_view_core =
       content_view_core->GetJavaObject();
-  if (j_content_view_core.is_null())
+
+  if (j_content_view_core.is_null() || j_content_video_view_embedder.is_null())
     return JavaObjectWeakGlobalRef(env, nullptr);
 
   return JavaObjectWeakGlobalRef(
       env, Java_ContentVideoView_createContentVideoView(
-               env, j_content_view_core, reinterpret_cast<intptr_t>(this),
+               env, j_content_view_core, j_content_video_view_embedder,
+               reinterpret_cast<intptr_t>(this),
                video_natural_size.width(), video_natural_size.height())
                .obj());
 }