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 e60246817f7730774bf6bea536a45fbe406d2376..c04744812da963f5f21d7dc4f582bed96d8ee237 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;
 class MediaSessionController;
 
 // This class adds Android specific extensions to the MediaWebContentsObserver.
@@ -31,13 +32,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);
 
   // Initiates a synchronous MediaSession request for browser side players.
   //
@@ -53,7 +56,7 @@ class CONTENT_EXPORT MediaWebContentsObserverAndroid
   void OnFrameInfoUpdated();
 #endif  // defined(VIDEO_HOLE)
 
-  // MediaWebContentsObserverAndroid overrides.
+  // MediaWebContentsObserver overrides.
   void RenderFrameDeleted(RenderFrameHost* render_frame_host) override;
   bool OnMessageReceived(const IPC::Message& message,
                          RenderFrameHost* render_frame_host) override;
@@ -85,6 +88,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.
@@ -104,6 +110,11 @@ class CONTENT_EXPORT MediaWebContentsObserverAndroid
       std::map<MediaPlayerId, scoped_ptr<MediaSessionController>>;
   MediaSessionMap media_session_map_;
 
+  using SurfaceViewManagerMap =
+      base::ScopedPtrHashMap<RenderFrameHost*,
+                             scoped_ptr<BrowserSurfaceViewManager>>;
+  SurfaceViewManagerMap surface_view_managers_;
+
   DISALLOW_COPY_AND_ASSIGN(MediaWebContentsObserverAndroid);
 };