Move ExternalVideoSurfaceHolder from WebContents UserData to BrowserMediaPlayerManager.

content/browser/renderer_host/render_widget_host_view_android.cc

Index: content/browser/renderer_host/render_widget_host_view_android.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc
index 3f5f584f08f84cc292e2cc4581d7768499673036..2be739d9737c84322596af6815ac29e5a3c2feb5 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.cc
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -35,11 +35,13 @@
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/browser/gpu/gpu_process_host_ui_shim.h"
 #include "content/browser/gpu/gpu_surface_tracker.h"
+#include "content/browser/media/android/browser_media_player_manager.h"
 #include "content/browser/renderer_host/compositor_impl_android.h"
 #include "content/browser/renderer_host/dip_util.h"
 #include "content/browser/renderer_host/image_transport_factory_android.h"
 #include "content/browser/renderer_host/input/synthetic_gesture_target_android.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
+#include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/common/gpu/client/gl_helper.h"
 #include "content/common/gpu/gpu_messages.h"
@@ -915,6 +917,13 @@ void RenderWidgetHostViewAndroid::UpdateContentViewCoreFrameMetadata(
         frame_metadata.location_bar_offset,
         frame_metadata.location_bar_content_translation,
         frame_metadata.overdraw_bottom_height);
+#if defined(VIDEO_HOLE)
+    if (host_) {
+        RenderViewHostImpl* rvhi = static_cast<RenderViewHostImpl*>(

[boliu, 2014/04/11 01:52:10]

This cast is not safe, there are cases where the host_ pointer is not a
RenderViewHostImpl (maybe not in android, but certainly true for other
platforms).

I think you can check host_->IsRenderView() before casting.

The usage example above in SynchronousFrameMetadata should be fixed too
(separate patch!)

[ycheo (away), 2014/04/11 05:05:46]

Done.

+            RenderViewHost::From(host_));
+        rvhi->media_player_manager()->OnFrameInfoUpdated();
+    }
+#endif  // defined(VIDEO_HOLE)
   }
 }