Verify test expectation collisions on High Sierra.

Fix a collision of Pixel_Video_VP9 on the Mac Intel 10.13 bot.

Tbr: ynovikov@chromium.org
No-Try: True
Bug: 830228
Change-Id: Ib074b0a8adc5961faea3341c082dcdbd2b7ff19e
Reviewed-on: https://chromium-review.googlesource.com/1012463Reviewed-by: Kenneth Russell <kbr@chromium.org>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Commit-Queue: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#550701}

content/test/gpu/gpu_tests/pixel_expectations.py

@@ -90,8 +90,9 @@ class PixelExpectations(GpuTestExpectations):
     # 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(hubbe): put this back after rebaseline below
+    # self.Fail('Pixel_Video_VP9',
+    #     ['highsierra', ('intel', 0xa2e)], bug=774809)
     self.Fail('Pixel_WebGLGreenTriangle_NonChromiumImage_NoAA_NoAlpha',
         ['highsierra', ('intel', 0xa2e)], bug=774809)
 
@@ -107,6 +108,8 @@ class PixelExpectations(GpuTestExpectations):
               ['linux', 'mac', 'win'], bug=744658)
 
     # TODO(hubbe): Temporary supressions for rebaseline
+    # TODO(hubbe): uncomment (or remove) above Pixel_Video_VP9
+    # suppression after rebaseline
     self.Fail('Pixel_Video_VP9', bug=754986)
     self.Fail('Pixel_DirectComposition_Video_VP9', bug=754986)
 

content/test/gpu/gpu_tests/verify_all_expectations_unittest.py

@@ -105,6 +105,14 @@ class VerifyTestExpectations(unittest.TestCase):
       StubBrowser('mac', 'sierra', 0x10de, '', 0x0fe9, '', ogl41, False),
       # macOS Sierra, AMD Mac Pro, validating cmd decoder
       StubBrowser('mac', 'sierra', 0x1002, '', 0x679e, '', ogl41, False),
+      # macOS High Sierra, Intel GPU, validating cmd decoder
+      StubBrowser('mac', 'highsierra', 0x8086, '', 0x0a2e, '', ogl41, False),
+      # macOS High Sierra, AMD Retina MacBook Pro, validating cmd decoder
+      StubBrowser('mac', 'highsierra', 0x1002, '', 0x6821, '', ogl41, False),
+      # macOS High Sierra, NVIDIA Retina MacBook Pro, validating cmd decoder
+      StubBrowser('mac', 'highsierra', 0x10de, '', 0x0fe9, '', ogl41, False),
+      # macOS High Sierra, AMD Mac Pro, validating cmd decoder
+      StubBrowser('mac', 'highsierra', 0x1002, '', 0x679e, '', ogl41, False),
       # Linux, NVIDIA Quadro P400, validating cmd decoder
       StubBrowser('linux', 'trusty', 0x10de, '', 0x1cb3, '', ogl45, False),
       # Linux, Intel HD 630, validating cmd decoder