Upstream implementation for embedded video for WebMediaPlayerAndroid

content/renderer/render_view_impl.h

Index: content/renderer/render_view_impl.h
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index 64085806118d287c739193f6de4aa3a704a384a5..cba8a96f785de34b0fc9944a180bfe82e0f05dc7 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -119,6 +119,12 @@ class ImageResourceFetcher;
 class ResourceFetcher;
 }
 
+#if defined(OS_ANDROID)
+namespace webkit_media {
+class WebMediaPlayerManagerAndroid;
+}
+#endif
+
 namespace WebKit {
 class WebApplicationCacheHost;
 class WebApplicationCacheHostClient;
@@ -642,6 +648,11 @@ class RenderViewImpl : public RenderWidget,
       const WebKit::WebURLRequest& request,
       WebKit::WebNavigationPolicy policy) OVERRIDE;
 
+#if defined(OS_ANDROID)
+  virtual webkit_media::WebMediaPlayerManagerAndroid*
+      GetWebMediaPlayerManager() OVERRIDE;
+#endif
+
   // webkit_glue::WebPluginPageDelegate implementation -------------------------
 
   virtual webkit::npapi::WebPluginDelegate* CreatePluginDelegate(
@@ -1321,6 +1332,11 @@ class RenderViewImpl : public RenderWidget,
   // Wraps the |webwidget_| as a MouseLockDispatcher::LockTarget interface.
   scoped_ptr<MouseLockDispatcher::LockTarget> webwidget_mouse_lock_target_;
 
+#if defined(OS_ANDROID)
+  // The media player manager for managing all the media players on this view.
+  scoped_ptr<webkit_media::WebMediaPlayerManagerAndroid> media_player_manager_;
+#endif
+
   // Plugins -------------------------------------------------------------------
 
   // All the currently active plugin delegates for this RenderView; kept so