Moves gpu_process tests onto the new test expectations format

Bug: chromium:698902
Change-Id: I861eaa6596d2d9240f16514b2b6fe2287d0fd2ca
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1548132Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Rakib Hasan <rmhasan@google.com>
Cr-Commit-Position: refs/heads/master@{#646585}

content/test/gpu/gpu_tests/gpu_process_expectations.py

-# Copyright 2013 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-from gpu_tests.gpu_test_expectations import GpuTestExpectations
-
-# See the GpuTestExpectations class for documentation.
-
-class GpuProcessExpectations(GpuTestExpectations):
-  def SetExpectations(self):
-    self.Fail('GpuProcess_video', ['linux'], bug=257109)
-
-    # Seems to have become flaky on Windows recently.
-    self.Flaky('GpuProcess_one_extra_workaround', ['win'], bug=700522)

content/test/gpu/gpu_tests/gpu_process_integration_test.py

@@ -6,7 +6,6 @@ import os
 import sys
 
 from gpu_tests import gpu_integration_test
-from gpu_tests import gpu_process_expectations
 from gpu_tests import path_util
 
 data_path = os.path.join(
@@ -61,7 +60,7 @@ class GpuProcessIntegrationTest(gpu_integration_test.GpuIntegrationTest):
 
   @classmethod
   def _CreateExpectations(cls):
-    return gpu_process_expectations.GpuProcessExpectations()
+    raise NotImplementedError
 
   @classmethod
   def GenerateGpuTests(cls, options):
@@ -487,6 +486,13 @@ class GpuProcessIntegrationTest(gpu_integration_test.GpuIntegrationTest):
     ])
     self._NavigateAndWait(test_path)
 
+  @classmethod
+  def ExpectationsFiles(cls):
+    return [
+        os.path.join(os.path.dirname(os.path.abspath(__file__)),
+                     'test_expectations',
+                     'gpu_process_expectations.txt')]
+
 def load_tests(loader, tests, pattern):
   del loader, tests, pattern  # Unused.
   return gpu_integration_test.LoadAllTestsInModule(sys.modules[__name__])

content/test/gpu/gpu_tests/test_expectations/gpu_process_expectations.txt

+# tags: [ linux win ]
+
+crbug.com/257109 [ linux ] GpuProcess_video [ Failure ]
+
+# Seems to have become flaky on Windows recently.
+crbug.com/700522 [ win ] GpuProcess_one_extra_workaround [ RetryOnFailure ]
+