Revert "Re-enable video pixel tests after rebaselining"

This reverts commit 1a9264dd.

Reason for revert: rebaseline didn't seem to work.

Failing builds:

https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/Win7%20FYI%20Release%20%28AMD%29/3655
https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/Win7%20FYI%20Release%20%28NVIDIA%29/3470
https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/Win10%20FYI%20Release%20%28Intel%20HD%20630%29/2954

Failing tests:

gpu_tests.pixel_integration_test.PixelIntegrationTest.Pixel_DirectComposition_Video_VP9
gpu_tests.pixel_integration_test.PixelIntegrationTest.Pixel_Video_VP9
gpu_tests.pixel_integration_test.PixelIntegrationTest.Pixel_DirectComposition_Video_MP4
gpu_tests.pixel_integration_test.PixelIntegrationTest.Pixel_Video_MP4

Original change's description:
> Re-enable video pixel tests after rebaselining
> 
> The tests were marked as failing and version numbers were incremented in
> https://crrev.com/c/1182222, but I forgot to re-enable the tests.
> 
> Bug: 869677, 913138, 858826, 819635, 774809
> Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
> Change-Id: I7fdb28c3dbaa7aad4137b16d8f9bf8fe15fe9a08
> Reviewed-on: https://chromium-review.googlesource.com/c/1214364
> Commit-Queue: Sunny Sachanandani <sunnyps@chromium.org>
> Reviewed-by: Kenneth Russell <kbr@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#615353}

TBR=kbr@chromium.org,sunnyps@chromium.org

Change-Id: I553c10ca8022a90a0afa73ffafa44aa5bbf4e2d1
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 869677, 913138, 858826, 819635, 774809
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Reviewed-on: https://chromium-review.googlesource.com/c/1372234Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Cr-Commit-Position: refs/heads/master@{#615553}

content/test/gpu/gpu_tests/pixel_expectations.py

@@ -58,11 +58,15 @@ class PixelExpectations(GpuTestExpectations):
     # TODO(kbr): flakily timing out on this configuration.
     self.Flaky('*', ['linux', 'intel', 'debug'], bug=648369)
 
-    # Flaky on Linux Nvidia
-    self.Flaky('Pixel_Video_MP4', ['linux', 'nvidia'], bug=819635)
+    # TODO(sunnyps): re-enable after rebaselining
+    # self.Flaky('Pixel_Video_MP4', ['android', 'nvidia'], bug=716564)
+    # self.Flaky('Pixel_Video_MP4', ['linux', 'nvidia'], bug=819635)
 
-    # Fails on Linux Nvidia
-    self.Fail('Pixel_Video_VP9', ['linux', 'nvidia'], bug=858826)
+    # TODO(sunnyps): temporarily disabling for rebaselining.
+    self.Fail('Pixel_Video_MP4', bug=869677)
+    self.Fail('Pixel_Video_VP9', bug=869677)
+    self.Fail('Pixel_DirectComposition_Video_MP4', bug=869677)
+    self.Fail('Pixel_DirectComposition_Video_VP9', bug=869677)
 
     # Flaky for unknown reasons only on macOS. Not planning to investigate
     # further.
@@ -79,10 +83,11 @@ class PixelExpectations(GpuTestExpectations):
         ['android', ('qualcomm', 'Adreno (TM) 330')], bug=773293)
 
     # Failing on Mac Intel HighSierra
-    self.Fail('Pixel_Video_MP4',
-        ['highsierra', ('intel', 0xa2e)], bug=774809)
-    self.Fail('Pixel_Video_VP9',
-        ['highsierra', ('intel', 0xa2e)], bug=774809)
+    # TODO(sunnyps): re-enable after rebaselining.
+    # self.Fail('Pixel_Video_MP4',
+    #     ['highsierra', ('intel', 0xa2e)], bug=774809)
+    # self.Fail('Pixel_Video_VP9',
+    #     ['highsierra', ('intel', 0xa2e)], bug=774809)
     self.Fail('Pixel_WebGLGreenTriangle_NonChromiumImage_NoAA_NoAlpha',
         ['highsierra', 'mojave', ('intel', 0xa2e)], bug=774809)
     self.Flaky('Pixel_OffscreenCanvasTransferBeforeStyleResize',
@@ -111,9 +116,9 @@ class PixelExpectations(GpuTestExpectations):
     self.Fail('Pixel_WebGLSadCanvas', ['mac'], bug=872423)
     self.Fail('Pixel_WebGLSadCanvas', ['android'], bug=575305)
 
-    # Failing on Android in general: crbug.com/858826
-    self.Fail('Pixel_Video_MP4', ['android'], bug=858826)
-    self.Fail('Pixel_Video_VP9', ['android'], bug=858826)
+    # Flaky on Android: crbug.com/860548
+    # TODO(sunnyps): re-enable after rebaselining.
+    # self.Flaky('Pixel_Video_VP9', ['android'], bug=860548)
 
     self.Fail('Pixel_CanvasLowLatencyWebGL', ['android', 'nvidia'], bug=868596)
     self.Fail('Pixel_OffscreenCanvasWebGLPaintAfterResize',
@@ -142,9 +147,3 @@ class PixelExpectations(GpuTestExpectations):
         ['mac', ('amd', 0x679e)], bug=911413)
     self.Fail('Pixel_Video_MP4_FourColors_Rot_270',
         ['mac', ('amd', 0x679e)], bug=911413)
-
-    # Fails on Windows Nvidia
-    self.Fail('Pixel_DirectComposition_Video_MP4', ['win', 'nvidia'],
-        bug=913138)
-    self.Fail('Pixel_DirectComposition_Video_VP9', ['win', 'nvidia'],
-        bug=913138)