Ties RenderFrameImpl VIDEO_HOLE observer to lifetime of RenderWidget.

content/renderer/render_frame_impl.cc

Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 6ccb9f5995949069dbeadc97faa76fd507a3ac9b..ddc634b2e0e103a33583f41c0694603b6b778abc 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -417,6 +417,9 @@ RenderFrameImpl::RenderFrameImpl(RenderViewImpl* render_view, int routing_id)
   RenderThread::Get()->AddRoute(routing_id_, this);
 
   render_view_->RegisterRenderFrame(this);
+#if defined(VIDEO_HOLE)
+  render_view_->RegisterVideoHoleFrame(this);
+#endif  // defined(VIDEO_HOLE)
 
 #if defined(OS_ANDROID)
   new JavaBridgeDispatcher(this);
@@ -431,9 +434,8 @@ RenderFrameImpl::~RenderFrameImpl() {
   FOR_EACH_OBSERVER(RenderFrameObserver, observers_, RenderFrameGone());
   FOR_EACH_OBSERVER(RenderFrameObserver, observers_, OnDestruct());
 
-#if defined(OS_ANDROID) && defined(VIDEO_HOLE)
-  if (media_player_manager_)
-    render_view_->UnregisterVideoHoleFrame(this);
+#if defined(VIDEO_HOLE)
+  render_view_->UnregisterVideoHoleFrame(this);
 #endif
 
   render_view_->UnregisterRenderFrame(this);
@@ -3560,9 +3562,6 @@ WebMediaPlayer* RenderFrameImpl::CreateAndroidWebMediaPlayer(
 RendererMediaPlayerManager* RenderFrameImpl::GetMediaPlayerManager() {
   if (!media_player_manager_) {
     media_player_manager_ = new RendererMediaPlayerManager(this);
-#if defined(VIDEO_HOLE)
-    render_view_->RegisterVideoHoleFrame(this);
-#endif  // defined(VIDEO_HOLE)
   }

[xhwang, 2014/07/08 00:02:43]

nit: no need for {} anymore.

[gunsch, 2014/07/08 00:06:23]

Done.

   return media_player_manager_;
 }