Add gpu accelerated config changes to SmokeTests.

SmokeTests are the subset of layout tests run on the android bots. This change
adds coverage to several historically problematic config-change scenarios.

These tests use a virtual suite that sets the flag "--use-gpu-in-tests". This
flag overrides the default test behavior of using MesaGL, which is not capable
of creating surfaces to use with gpu accelerated decoding (at least on Android).

This change also fixes some test/expectations rot.

BUG=555703
TESTS=Config change LayoutTests.

Committed: https://crrev.com/b8bf5eba6b6cd3623f16404c746251bf662d141d
Review-Url: https://codereview.chromium.org/1644763002
Cr-Original-Commit-Position: refs/heads/master@{#407938}
Cr-Commit-Position: refs/heads/master@{#408266}

content/browser/gpu/gpu_process_host.cc

@@ -108,58 +108,59 @@ namespace {
 
 // Command-line switches to propagate to the GPU process.
 static const char* const kSwitchNames[] = {
-  switches::kDisableAcceleratedVideoDecode,
-  switches::kDisableBreakpad,
-  switches::kDisableGpuSandbox,
-  switches::kDisableGpuWatchdog,
-  switches::kDisableGLExtensions,
-  switches::kDisableLogging,
-  switches::kDisableSeccompFilterSandbox,
+    switches::kDisableAcceleratedVideoDecode,
+    switches::kDisableBreakpad,
+    switches::kDisableGpuSandbox,
+    switches::kDisableGpuWatchdog,
+    switches::kDisableGLExtensions,
+    switches::kDisableLogging,
+    switches::kDisableSeccompFilterSandbox,
 #if defined(ENABLE_WEBRTC)
-  switches::kDisableWebRtcHWEncoding,
+    switches::kDisableWebRtcHWEncoding,
 #endif
 #if defined(OS_WIN)
-  switches::kEnableAcceleratedVpxDecode,
-  switches::kEnableMFH264Encoding,
+    switches::kEnableAcceleratedVpxDecode,
+    switches::kEnableMFH264Encoding,
 #endif
-  switches::kEnableHeapProfiling,
-  switches::kEnableLogging,
+    switches::kEnableHeapProfiling,
+    switches::kEnableLogging,
 #if defined(OS_CHROMEOS)
-  switches::kDisableVaapiAcceleratedVideoEncode,
+    switches::kDisableVaapiAcceleratedVideoEncode,
 #endif
-  switches::kGpuDriverBugWorkarounds,
-  switches::kGpuStartupDialog,
-  switches::kGpuSandboxAllowSysVShm,
-  switches::kGpuSandboxFailuresFatal,
-  switches::kGpuSandboxStartEarly,
-  switches::kLoggingLevel,
-  switches::kEnableLowEndDeviceMode,
-  switches::kDisableLowEndDeviceMode,
-  switches::kEnableMemoryBenchmarking,
-  switches::kNoSandbox,
-  switches::kProfilerTiming,
-  switches::kTestGLLib,
-  switches::kTraceConfigFile,
-  switches::kTraceStartup,
-  switches::kTraceToConsole,
-  switches::kV,
-  switches::kVModule,
+    switches::kGpuDriverBugWorkarounds,
+    switches::kGpuStartupDialog,
+    switches::kGpuSandboxAllowSysVShm,
+    switches::kGpuSandboxFailuresFatal,
+    switches::kGpuSandboxStartEarly,
+    switches::kLoggingLevel,
+    switches::kEnableLowEndDeviceMode,
+    switches::kDisableLowEndDeviceMode,
+    switches::kEnableMemoryBenchmarking,
+    switches::kNoSandbox,
+    switches::kProfilerTiming,
+    switches::kTestGLLib,
+    switches::kTraceConfigFile,
+    switches::kTraceStartup,
+    switches::kTraceToConsole,
+    switches::kUseGpuInTests,
+    switches::kV,
+    switches::kVModule,
 #if defined(OS_MACOSX)
-  switches::kDisableRemoteCoreAnimation,
-  switches::kEnableSandboxLogging,
-  switches::kShowMacOverlayBorders,
+    switches::kDisableRemoteCoreAnimation,
+    switches::kEnableSandboxLogging,
+    switches::kShowMacOverlayBorders,
 #endif
 #if defined(USE_OZONE)
-  switches::kOzonePlatform,
+    switches::kOzonePlatform,
 #endif
 #if defined(USE_X11) && !defined(OS_CHROMEOS)
-  switches::kWindowDepth,
-  switches::kX11Display,
-  switches::kX11VisualID,
+    switches::kWindowDepth,
+    switches::kX11Display,
+    switches::kX11VisualID,
 #endif
-  switches::kGpuTestingGLVendor,
-  switches::kGpuTestingGLRenderer,
-  switches::kGpuTestingGLVersion,
+    switches::kGpuTestingGLVendor,
+    switches::kGpuTestingGLRenderer,
+    switches::kGpuTestingGLVersion,
 };
 
 enum GPUProcessLifetimeEvent {

content/browser/renderer_host/render_process_host_impl.cc

@@ -1510,6 +1510,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
     // This flag needs to be propagated to the renderer process for
     // --in-process-webgl.
     switches::kUseGL,
+    switches::kUseGpuInTests,
     switches::kUseMobileUserAgent,
     switches::kUseRemoteCompositing,
     switches::kV,

content/shell/app/shell_main_delegate.cc

@@ -167,7 +167,8 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
     command_line.AppendSwitch(switches::kEnableLogging);
     command_line.AppendSwitch(switches::kAllowFileAccessFromFiles);
     // only default to osmesa if the flag isn't already specified.
-    if (!command_line.HasSwitch(switches::kUseGL)) {
+    if (!command_line.HasSwitch(switches::kUseGpuInTests) &&
+        !command_line.HasSwitch(switches::kUseGL)) {
       command_line.AppendSwitchASCII(switches::kUseGL,
                                      gl::kGLImplementationOSMesaName);
     }

third_party/WebKit/LayoutTests/MSANExpectations

@@ -41,3 +41,6 @@ crbug.com/462190 [ Linux ] inspector-protocol/heap-profiler/heap-snapshot-with-e
 
 # Intentionally failed allocations, via partitionAllocGenericFlags()
 crbug.com/577889 [ Linux ] fast/js/typed-array-allocation-failure.html [ Crash ]
+
+# These tests use OpenGl, which crashes on MSAN builds due to missing instrumentation
+crbug.com/555703 [ Linux ] virtual/media-gpu-accelerated [ Skip ]
\ No newline at end of file

third_party/WebKit/LayoutTests/NeverFixTests

@@ -91,6 +91,14 @@ fast/harness/sample-fail-mismatch-reftest.html [ WontFix ]
 # Tests in media/stable are only supposed to be run as virtual test (see virtual/stable/media).
 media/stable [ WontFix ]
 
+# These tests are only supposed be run as virtual test. See /virtual/media-gpu-accelerated/http/tests/media/media-source/.
+[ Android ] http/tests/media/media-source/mediasource-config-change-mp4-av-audio-bitrate.html [ WontFix ]
+[ Android ] http/tests/media/media-source/mediasource-config-change-mp4-av-framesize.html [ WontFix ]
+[ Android ] http/tests/media/media-source/mediasource-config-change-mp4-av-video-bitrate.html [ WontFix ]
+[ Android ] http/tests/media/media-source/mediasource-config-change-mp4-v-bitrate.html [ WontFix ]
+[ Android ] http/tests/media/media-source/mediasource-config-change-mp4-v-framerate.html [ WontFix ]
+[ Android ] http/tests/media/media-source/mediasource-config-change-mp4-v-framesize.html [ WontFix ]
+
 # Only run fake-Android tests on Linux
 [ Mac Win ] virtual/android [ WontFix ]
 

third_party/WebKit/LayoutTests/SmokeTests

@@ -173,8 +173,6 @@ fast/xsl/import-non-document-node.xhtml
 fast/xsl/xslt-doc-enc.xml
 fullscreen/full-screen-request-rejected.html
 http/tests/download/inherited-encoding-form-submission-result.html
-http/tests/media/media-source/mediasource-play.html
-http/tests/media/media-source/webkitmediasource-play.html
 http/tests/security/no-javascript-refresh.php
 inspector-protocol/input/dispatchMouseEvent.html
 loader/reload-subresource-when-type-changes.html
@@ -208,6 +206,10 @@ userstyles/simple-stylesheet.html
 virtual/deferred/fast/images/link-body-content-imageDimensionChanged-crash.html
 virtual/prefer_compositing_to_lcd_text/compositing/scrollbars/scrollbar-large-overflow-rectangle.html
 virtual/stable/webexposed/internal-properties-should-not-be-exposed.html
+virtual/media-gpu-accelerated/http/tests/media/media-source/mediasource-play.html
+virtual/media-gpu-accelerated/http/tests/media/media-source/mediasource-config-change-mp4-av-audio-bitrate.html
+virtual/media-gpu-accelerated/http/tests/media/media-source/mediasource-config-change-mp4-av-framesize.html
+virtual/media-gpu-accelerated/http/tests/media/media-source/mediasource-config-change-mp4-v-framerate.html
 webaudio/codec-tests/vorbis/vbr-96kbps-44khz.html
 webaudio/codec-tests/vorbis/vbr-128kbps-44khz.html
 webaudio/codec-tests/vorbis/vbr-70kbps-44khz.html

third_party/WebKit/LayoutTests/TestExpectations

@@ -725,12 +725,9 @@ crbug.com/267206 [ Mac ] virtual/scroll_customization/fast/scrolling/scrollbar-t
 crbug.com/524160 [ Debug ] http/tests/media/media-source/mediasource-appendbuffer-quota-exceeded.html [ Timeout ]
 crbug.com/524160 [ Debug ] http/tests/media/media-source/mediasource-appendstream-quota-exceeded.html [ Timeout ]
 
-crbug.com/568827 [ Android ] http/tests/media/media-source/mediasource-config-change-mp4-av-audio-bitrate.html [ Failure ]
-crbug.com/555703 [ Android ] http/tests/media/media-source/mediasource-config-change-mp4-av-framesize.html [ Failure ]
-crbug.com/555703 [ Android ] http/tests/media/media-source/mediasource-config-change-mp4-av-video-bitrate.html [ Failure ]
-crbug.com/555703 [ Android ] http/tests/media/media-source/mediasource-config-change-mp4-v-bitrate.html [ Failure ]
-crbug.com/555703 [ Android ] http/tests/media/media-source/mediasource-config-change-mp4-v-framerate.html [ Failure ]
-crbug.com/555703 [ Android ] http/tests/media/media-source/mediasource-config-change-mp4-v-framesize.html [ Failure ]
+# On these platforms (all but Android) media tests don't currently use gpu-accelerated (proprietary) codecs, so no
+# benefit to running them again with gpu acceleration enabled.
+crbug.com/555703 [ Linux Mac Win ] virtual/media-gpu-accelerated [ Skip ]
 
 crbug.com/517449 [ Android ] css3/images/optimize-contrast-image.html [ Failure ]
 

third_party/WebKit/LayoutTests/VirtualTestSuites

@@ -87,6 +87,11 @@
              "--enable-fixed-layout", "--enable-viewport", "--disable-canvas-aa",
              "--disable-composited-antialiasing"]
   },
+  {
+    "prefix": "media-gpu-accelerated",
+    "base": "http/tests/media/media-source",
+    "args": ["--use-gpu-in-tests"]
+  },
   {
     "prefix": "android",
     "base": "media/mediadocument",

third_party/WebKit/LayoutTests/platform/android/http/tests/media/media-source/mediasource-config-change-mp4-a-bitrate-expected.txt

-CONSOLE WARNING: line 95: Ignore this warning. See https://crbug.com/568704#c2
+CONSOLE WARNING: line 106: Ignore this warning. See https://crbug.com/568704#c2
 This is a testharness.js-based test.
 PASS Tests mp4 audio-only bitrate changes. 
 Harness: the test ran to completion.

third_party/WebKit/LayoutTests/platform/android/http/tests/media/media-source/mediasource-config-change-mp4-av-audio-bitrate-expected.txt

-CONSOLE WARNING: line 95: Ignore this warning. See https://crbug.com/568704#c2
+CONSOLE WARNING: line 106: Ignore this warning. See https://crbug.com/568704#c2
 This is a testharness.js-based test.
 PASS Tests mp4 audio bitrate changes in multiplexed content. 
 Harness: the test ran to completion.

third_party/WebKit/LayoutTests/platform/android/http/tests/media/media-source/mediasource-config-change-mp4-av-framesize-expected.txt

-CONSOLE WARNING: line 95: Ignore this warning. See https://crbug.com/568704#c2
+CONSOLE WARNING: line 106: Ignore this warning. See https://crbug.com/568704#c2
 This is a testharness.js-based test.
 PASS Tests mp4 frame size changes in multiplexed content. 
 Harness: the test ran to completion.

third_party/WebKit/LayoutTests/platform/android/http/tests/media/media-source/mediasource-config-change-mp4-av-video-bitrate-expected.txt

-CONSOLE WARNING: line 95: Ignore this warning. See https://crbug.com/568704#c2
+CONSOLE WARNING: line 106: Ignore this warning. See https://crbug.com/568704#c2
 This is a testharness.js-based test.
 PASS Tests mp4 video bitrate changes in multiplexed content. 
 Harness: the test ran to completion.

third_party/WebKit/LayoutTests/platform/android/http/tests/media/media-source/mediasource-config-change-mp4-v-bitrate-expected.txt

-CONSOLE WARNING: line 95: Ignore this warning. See https://crbug.com/568704#c2
+CONSOLE WARNING: line 106: Ignore this warning. See https://crbug.com/568704#c2
 This is a testharness.js-based test.
 PASS Tests mp4 video-only bitrate changes. 
 Harness: the test ran to completion.

third_party/WebKit/LayoutTests/platform/android/http/tests/media/media-source/mediasource-config-change-mp4-v-framerate-expected.txt

-CONSOLE WARNING: line 95: Ignore this warning. See https://crbug.com/568704#c2
+CONSOLE WARNING: line 106: Ignore this warning. See https://crbug.com/568704#c2
 This is a testharness.js-based test.
 PASS Tests mp4 video-only frame rate changes. 
 Harness: the test ran to completion.

third_party/WebKit/LayoutTests/platform/android/http/tests/media/media-source/mediasource-config-change-mp4-v-framesize-expected.txt

-CONSOLE WARNING: line 95: Ignore this warning. See https://crbug.com/568704#c2
+CONSOLE WARNING: line 106: Ignore this warning. See https://crbug.com/568704#c2
 This is a testharness.js-based test.
 PASS Tests mp4 video-only frame size changes. 
 Harness: the test ran to completion.

third_party/WebKit/LayoutTests/virtual/media-gpu-accelerated/http/tests/media/media-source/README.txt

+The media-gpu-accelerated prefix sets flags to facilitate hardware accelerated
+video decoding on android bots.
+
+TODO(chcunningham): Explore enabling hardware acceleration for desktop bots.
+Non-android bots do not currently test with proprietary codecs, which translates
+to no hardware acceleration.
+
+Layout tests generally run using Mesa (see http://crrev.com/23868030) to
+to produce more stable output for pixel layout tests when running on different
+devices. However, Mesa is not compatible with android's SurfaceTexture,
+used in in HW accelerated video decoding (H264 in mp4). We specify
+use-gpu-in-tests to override the MesaGL default.