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 03b11fb029fee3a10beeb932a0c0a33fb3d41955..7a846af5ee05f597231391726afe65876dee1e89 100644
--- a/media/blink/webmediaplayer_impl.cc
+++ b/media/blink/webmediaplayer_impl.cc
@@ -250,9 +250,6 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
   force_video_overlays_ = base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kForceVideoOverlays);
 
-  disable_fullscreen_video_overlays_ =
-      !base::FeatureList::IsEnabled(media::kOverlayFullscreenVideo);
-
   if (delegate_)
     delegate_id_ = delegate_->AddObserver(this);
 
@@ -312,6 +309,10 @@ void WebMediaPlayerImpl::load(LoadType load_type,
   DoLoad(load_type, url, cors_mode);
 }
 
+void WebMediaPlayerImpl::SetEnableFullscreenOverlays(bool enable_overlays) {
+  enable_fullscreen_video_overlays_ = enable_overlays;
+}
+
 bool WebMediaPlayerImpl::supportsOverlayFullscreenVideo() {
 #if defined(OS_ANDROID)
   return true;
@@ -345,14 +346,14 @@ void WebMediaPlayerImpl::DisableOverlay() {
 }
 
 void WebMediaPlayerImpl::enteredFullscreen() {
-  if (!force_video_overlays_ && !disable_fullscreen_video_overlays_)
+  if (!force_video_overlays_ && enable_fullscreen_video_overlays_)

[ddorwin, 2016/12/16 19:15:18]

Separate from this CL:

This logic is not obvious. Specifically, why we would not call this when
force_video_overlays_ is true. I believe it is because we have already called
EnableOverlay() in CreateRenderer(). But this is inferring the current state
from a cause.

It would seem to make more sense to check the state here, and there is already a
member tracking this.

A)
Thus, I wonder if this shouldn't be:
  if (!overlay_enabled_ && ...

B)
However, this would be better if EnableOverlay() handled this internally rather
than requiring all call sites to handle it. Thus, we could remove the first half
of the condition and add if(overlay_enabled_) return; to EnableOverlay().

[amp, 2016/12/16 19:25:03]

Acknowledged.

     EnableOverlay();
   if (observer_)
     observer_->OnEnteredFullscreen();
 }
 
 void WebMediaPlayerImpl::exitedFullscreen() {
-  if (!force_video_overlays_ && !disable_fullscreen_video_overlays_)
+  if (!force_video_overlays_ && enable_fullscreen_video_overlays_)

[ddorwin, 2016/12/16 19:15:18]

Similarly, enable_fullscreen_video_overlays_ is the cause rather than the state.

A)
And this would be if (!force_video_overlays_ && overlay_enabled_).

B)
If we went with this option above, this could probably just be a call to
DisableOverlay() in all cases. That method would return early if
~overlay_enabled_ || force_video_overlays_.

[amp, 2016/12/16 19:25:03]

Acknowledged.

     DisableOverlay();
   if (observer_)
     observer_->OnExitedFullscreen();