Make "on-demand" video surface layer the hardcoded default.

Bug: 924249
Change-Id: Id91994c87910d19884222a7060ecca28d0894bb0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1427599
Commit-Queue: Mounir Lamouri <mlamouri@chromium.org>
Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
Reviewed-by: Bo <boliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#644568}

android_webview/lib/aw_main_delegate.cc

@@ -189,9 +189,8 @@ bool AwMainDelegate::BasicStartupComplete(int* exit_code) {
     features.DisableIfNotSet(media::kUseAndroidOverlay);
 
     // WebView doesn't support embedding CompositorFrameSinks which is needed
-    // for UseSurfaceLayerForVideo[PIP] feature. https://crbug.com/853832
+    // for UseSurfaceLayerForVideo feature. https://crbug.com/853832
     features.DisableIfNotSet(media::kUseSurfaceLayerForVideo);
-    features.DisableIfNotSet(media::kUseSurfaceLayerForVideoPIP);
 
     // WebView does not support EME persistent license yet, because it's not
     // clear on how user can remove persistent media licenses from UI.

content/renderer/media/media_factory.cc

@@ -156,10 +156,7 @@ MediaFactory::GetVideoSurfaceLayerMode() {
   if (base::FeatureList::IsEnabled(media::kUseSurfaceLayerForVideo))
     return blink::WebMediaPlayer::SurfaceLayerMode::kAlways;
 
-  if (base::FeatureList::IsEnabled(media::kUseSurfaceLayerForVideoPIP))
-    return blink::WebMediaPlayer::SurfaceLayerMode::kOnDemand;
-
-  return blink::WebMediaPlayer::SurfaceLayerMode::kNever;
+  return blink::WebMediaPlayer::SurfaceLayerMode::kOnDemand;
 }
 
 MediaFactory::MediaFactory(

media/base/media_switches.cc

@@ -306,12 +306,6 @@ const base::Feature kUnifiedAutoplay{"UnifiedAutoplay",
 const base::Feature kUseSurfaceLayerForVideo{"UseSurfaceLayerForVideo",
                                              base::FEATURE_DISABLED_BY_DEFAULT};
 
-// Use SurfaceLayer instead of VideoLayer when entering Picture-in-Picture mode.
-// Does nothing if UseSurfaceLayerForVideo is enabled.  Does not affect
-// MediaStream playbacks.
-const base::Feature kUseSurfaceLayerForVideoPIP{
-    "UseSurfaceLayerForVideoPIP", base::FEATURE_ENABLED_BY_DEFAULT};
-
 // Enable VA-API hardware encode acceleration for VP8.
 const base::Feature kVaapiVP8Encoder{"VaapiVP8Encoder",
                                      base::FEATURE_ENABLED_BY_DEFAULT};

media/base/media_switches.h

@@ -134,7 +134,6 @@ MEDIA_EXPORT extern const base::Feature kUseModernMediaControls;
 MEDIA_EXPORT extern const base::Feature kUseNewMediaCache;
 MEDIA_EXPORT extern const base::Feature kUseR16Texture;
 MEDIA_EXPORT extern const base::Feature kUseSurfaceLayerForVideo;
-MEDIA_EXPORT extern const base::Feature kUseSurfaceLayerForVideoPIP;
 MEDIA_EXPORT extern const base::Feature kVaapiVP8Encoder;
 MEDIA_EXPORT extern const base::Feature kVaapiVP9Encoder;
 MEDIA_EXPORT extern const base::Feature kVideoBlitColorAccuracy;