Clean up the UseSurfaceLayerForVideo feature from the testing config.

Also, add http://crbug/1134146 to clean up the feature-related code in
media/blink/video_frame_compositor_unittest.cc.

Bug: 1126640
Change-Id: Ibaaacb382ac80c443a25c7c27d3f943bb789cc24
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2442870Reviewed-by: Frank Liberato <liberato@chromium.org>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Steven Holte <holte@chromium.org>
Commit-Queue: Caitlin Fischer <caitlinfischer@google.com>
Cr-Commit-Position: refs/heads/master@{#813932}

content/test/gpu/gpu_tests/webgl_conformance_integration_test.py

@@ -359,9 +359,6 @@ class WebGLConformanceIntegrationTest(gpu_integration_test.GpuIntegrationTest):
         # TODO(http://crbug.com/832952): Remove this when WebXR spec is more
         # stable and setCompatibleXRDevice is part of the conformance test.
         '--disable-blink-features=WebXR',
-        # TODO(crbug.com/830901): see whether disabling this feature
-        # makes the WebGL video upload tests reliable again.
-        '--disable-features=UseSurfaceLayerForVideo',
     ])
     # Note that the overriding of the default --js-flags probably
     # won't interact well with RestartBrowserIfNecessaryWithArgs, but

content/test/gpu/measure_power_intel.py

@@ -22,7 +22,7 @@ Sample runs:
 
 python measure_power_intel.py --browser=canary --duration=10 --delay=5
   --verbose --url="https://www.youtube.com/watch?v=0XdS37Re1XQ"
-  --extra-browser-args="--no-sandbox --disable-features=UseSurfaceLayerForVideo"
+  --extra-browser-args="--no-sandbox"
 
 It is recommended to test with optimized builds of Chromium e.g. these GN args:
 

media/blink/video_frame_compositor_unittest.cc

@@ -56,6 +56,8 @@ class VideoFrameCompositorTest : public VideoRendererSink::RenderCallback,
 
   void SetUp() override {
     if (IsSurfaceLayerForVideoEnabled()) {
+      // TODO(http://crbug/1134146): Clean up the tests in this file since the
+      // feature UseSurfaceLayerForVideo no longer exists.
       feature_list_.InitFromCommandLine("UseSurfaceLayerForVideo", "");
 
       // When SurfaceLayerForVideo is enabled, |compositor_| owns the

media/blink/webmediaplayer_impl.h

@@ -925,8 +925,7 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl
   // Monitors the player events.
   base::WeakPtr<MediaObserver> observer_;
 
-  // Owns the weblayer and obtains/maintains SurfaceIds for
-  // kUseSurfaceLayerForVideo feature.
+  // Owns the weblayer and obtains/maintains SurfaceIds.
   std::unique_ptr<blink::WebSurfaceLayerBridge> bridge_;
 
   // The maximum video keyframe distance that allows triggering background

testing/variations/fieldtrial_testing_config.json

@@ -7165,25 +7165,6 @@
             ]
         }
     ],
-    "VideoSurfaceLayer": [
-        {
-            "platforms": [
-                "linux",
-                "mac",
-                "windows",
-                "chromeos",
-                "android"
-            ],
-            "experiments": [
-                {
-                    "name": "Enabled",
-                    "enable_features": [
-                        "UseSurfaceLayerForVideo"
-                    ]
-                }
-            ]
-        }
-    ],
     "VideoToolboxVp9Decoding": [
         {
             "platforms": [