Enable SurfaceView fullscreen video on Android with WebMediaPlayerImpl

content/browser/media/android/media_web_contents_observer_android.h

Index: content/browser/media/android/media_web_contents_observer_android.h
diff --git a/content/browser/media/android/media_web_contents_observer_android.h b/content/browser/media/android/media_web_contents_observer_android.h
index 5a6f481ed6e3011f42e0bfd3c3c498cf85adbe91..64de56c3e4cb7a06d6c54fa98c95e2cd97697f45 100644
--- a/content/browser/media/android/media_web_contents_observer_android.h
+++ b/content/browser/media/android/media_web_contents_observer_android.h
@@ -18,6 +18,7 @@ namespace content {
 class BrowserCdmManager;
 class BrowserMediaPlayerManager;
 class BrowserMediaSessionManager;
+class BrowserSurfaceViewManager;
 
 // This class adds Android specific extensions to the MediaWebContentsObserver.
 class CONTENT_EXPORT MediaWebContentsObserverAndroid
@@ -30,13 +31,15 @@ class CONTENT_EXPORT MediaWebContentsObserverAndroid
   static MediaWebContentsObserverAndroid* FromWebContents(
       WebContents* web_contents);
 
-  // Gets the media player or media session manager associated with the given
-  // |render_frame_host| respectively. Creates a new one if it doesn't exist.
-  // The caller doesn't own the returned pointer.
+  // Gets one of the managers associated with the given |render_frame_host|.
+  // Creates a new one if it doesn't exist. The caller doesn't own the
+  // returned pointer.
   BrowserMediaPlayerManager* GetMediaPlayerManager(
       RenderFrameHost* render_frame_host);
   BrowserMediaSessionManager* GetMediaSessionManager(
       RenderFrameHost* render_frame_host);
+  BrowserSurfaceViewManager* GetSurfaceViewManager(
+      RenderFrameHost* render_frame_host);
 
 #if defined(VIDEO_HOLE)
   void OnFrameInfoUpdated();
@@ -59,6 +62,9 @@ class CONTENT_EXPORT MediaWebContentsObserverAndroid
   bool OnMediaSessionMessageReceived(const IPC::Message& message,
                                      RenderFrameHost* render_frame_host);
 
+  bool OnSurfaceViewManagerMessageReceived(const IPC::Message& message,
+                                     RenderFrameHost* render_frame_host);
+
   void OnSetCdm(RenderFrameHost* render_frame_host, int player_id, int cdm_id);
 
   // Map from RenderFrameHost* to BrowserMediaPlayerManager.
@@ -73,6 +79,11 @@ class CONTENT_EXPORT MediaWebContentsObserverAndroid
                              scoped_ptr<BrowserMediaSessionManager>>;
   MediaSessionManagerMap media_session_managers_;
 
+  using SurfaceViewManagerMap =
+      base::ScopedPtrHashMap<RenderFrameHost*,
+                             scoped_ptr<BrowserSurfaceViewManager>>;
+  SurfaceViewManagerMap surface_view_managers_;
+
   DISALLOW_COPY_AND_ASSIGN(MediaWebContentsObserverAndroid);
 };