Use GVR async reprojection video surface for fullscreen in VR shell

content/browser/media/android/browser_surface_view_manager.h

Index: content/browser/media/android/browser_surface_view_manager.h
diff --git a/content/browser/media/android/browser_surface_view_manager.h b/content/browser/media/android/browser_surface_view_manager.h
index a15e52e398586a0531349f25044d7e4e98c07648..e0619b942fd8b300bcfc2a4d5b08e431a85ea29f 100644
--- a/content/browser/media/android/browser_surface_view_manager.h
+++ b/content/browser/media/android/browser_surface_view_manager.h
@@ -10,8 +10,9 @@
 #include <memory>
 
 #include "base/macros.h"
-#include "content/browser/android/content_video_view.h"
 #include "content/common/content_export.h"
+#include "content/public/browser/android/video_surface_manager.h"
+#include "content/public/browser/android/video_surface_provider.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace content {
@@ -22,12 +23,12 @@ class RenderFrameHost;
 // a fullscreen media player. Its SurfaceView is registered so that a decoder
 // in the GPU process can look it up and render to it.
 class CONTENT_EXPORT BrowserSurfaceViewManager
-    : public ContentVideoView::Client {
+    : public VideoSurfaceProvider::Client {
  public:
   explicit BrowserSurfaceViewManager(RenderFrameHost* render_frame_host);
   ~BrowserSurfaceViewManager();
 
-  // ContentVideoView::Client overrides.
+  // VideoSurfaceProvider::Client overrides.
   void SetVideoSurface(gl::ScopedJavaSurface surface) override;
   void DidExitFullscreen(bool release_media_player) override;
 
@@ -46,11 +47,13 @@ class CONTENT_EXPORT BrowserSurfaceViewManager
 
   RenderFrameHost* const render_frame_host_;
 
-  // The surface id of the ContentVideoView surface.
+  VideoSurfaceManager* video_surface_manager_;
+
+  // The surface id of the VideoSurfaceProvider surface.
   int surface_id_;
 
-  // The fullscreen view that contains a SurfaceView.
-  std::unique_ptr<ContentVideoView> content_video_view_;
+  // The provider for fullscreen video surface.
+  VideoSurfaceProvider* video_surface_provider_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserSurfaceViewManager);
 };