Do not use overlays when VR shell is enabled.

media/blink/webmediaplayer_impl.cc

Index: media/blink/webmediaplayer_impl.cc
diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc
index 578f7ede2799893f4ea63ba1b0b3006fefdff25e..4992f02fe55fdda3dbd53ea058fa20924b50d2ba 100644
--- a/media/blink/webmediaplayer_impl.cc
+++ b/media/blink/webmediaplayer_impl.cc
@@ -235,6 +235,7 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
       renderer_factory_(std::move(renderer_factory)),
       surface_manager_(params.surface_manager()),
       overlay_surface_id_(SurfaceManager::kNoSurfaceID),
+      in_vr_(false),
       suppress_destruction_errors_(false),
       can_suspend_state_(CanSuspendState::UNKNOWN),
       use_fallback_path_(false),
@@ -352,14 +353,14 @@ void WebMediaPlayerImpl::DisableOverlay() {
 }
 
 void WebMediaPlayerImpl::enteredFullscreen() {
-  if (!force_video_overlays_ && !disable_fullscreen_video_overlays_)
+  if (!force_video_overlays_ && !disable_fullscreen_video_overlays_ && !in_vr_)
     EnableOverlay();
   if (observer_)
     observer_->OnEnteredFullscreen();
 }
 
 void WebMediaPlayerImpl::exitedFullscreen() {
-  if (!force_video_overlays_ && !disable_fullscreen_video_overlays_)
+  if (!force_video_overlays_ && !disable_fullscreen_video_overlays_ && !in_vr_)
     DisableOverlay();
   if (observer_)
     observer_->OnExitedFullscreen();
@@ -1473,6 +1474,10 @@ void WebMediaPlayerImpl::SetDeviceScaleFactor(float scale_factor) {
   cast_impl_.SetDeviceScaleFactor(scale_factor);
 }
 
+void WebMediaPlayerImpl::SetInVr(bool in_vr) {

[liberato (no reviews please), 2016/12/06 17:54:43]

might want EnteredVr / ExitedVr that handle turning off overlays if needed, per
your comment elsewhere.  mirrors how we handle full screen.

[amp, 2016/12/06 18:08:16]

Yea that sounds better.

+  in_vr_ = in_vr;
+}
+
 void WebMediaPlayerImpl::setPoster(const blink::WebURL& poster) {
   cast_impl_.setPoster(poster);
 }
@@ -1572,7 +1577,7 @@ void WebMediaPlayerImpl::OnSurfaceRequested(
 }
 
 std::unique_ptr<Renderer> WebMediaPlayerImpl::CreateRenderer() {
-  if (force_video_overlays_)
+  if (force_video_overlays_ && !in_vr_)
     EnableOverlay();
 
   RequestSurfaceCB request_surface_cb;