Reenable IOSurface Canvas2D. Disable new trace tests.

content/test/gpu/gpu_tests/trace_test.py

Index: content/test/gpu/gpu_tests/trace_test.py
diff --git a/content/test/gpu/gpu_tests/trace_test.py b/content/test/gpu/gpu_tests/trace_test.py
index 19ba60aab9906c2124798638f4e45498e70f2463..1a5f4c9088304c0377c929d0e60ca1076bd6c895 100644
--- a/content/test/gpu/gpu_tests/trace_test.py
+++ b/content/test/gpu/gpu_tests/trace_test.py
@@ -87,6 +87,15 @@ class TraceTestBase(gpu_test_base.TestBase):
     # Utilize pixel tests page set as a set of simple pages to load.
     story_set = page_sets.PixelTestsStorySet(self.GetExpectations(),
                                              base_name=self.Name())
+
+    # Skip some stories as a temporary debugging measure.
+    # https://crbug.com/595754.
+    # stories = []
+    # for story in story_set.stories:
+    #   if '2DCanvasWebGL' not in story.display_name:
+    #     stories.append(story)
+    # story_set.stories = stories

[Ken Russell (switch to Gerrit), 2016/03/21 21:14:10]

This code is commented out? Don't see how it will have an effect.

To be clear, I'm suggesting making the following change in
src/content/test/gpu/gpu_tests/trace_test_expectations.py:

class TraceTestExpectations(GpuTestExpectations):
  def SetExpectations(self):
    self.Skip('TraceTest.IOSurface2DCanvasWebGL', ['mac'], bug=595754)
    self.Skip(TraceTest.2DCanvasWebGL', bug=595754)

[erikchen, 2016/03/21 21:27:52]

I didn't expect to be able to skip running a test from a method that sets
expectations for tests. I've followed your suggestion.

+
     for story in story_set:
       story.script_to_evaluate_on_commit = test_harness_script
     return story_set