Get rid of PageSet.FromDict from some simple benchmarks in gpu_tests/.

content/test/gpu/gpu_tests/context_lost.py

 # Copyright (c) 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.
 import os
 
 from telemetry import test as test_module
 from telemetry.core import util
+from telemetry.page import page
 from telemetry.page import page_set
+# pylint: disable=W0401,W0614
 from telemetry.page import page_test
+from telemetry.page.actions.all_page_actions import *
 
 data_path = os.path.join(
     util.GetChromiumSrcDir(), 'content', 'test', 'data', 'gpu')
 
 wait_timeout = 20  # seconds
 
 harness_script = r"""
   var domAutomationController = {};
 
   domAutomationController._loaded = false;
@@ skipping 64 matching lines @@
           pass
         new_tab.Close()
         if not completed:
           raise page_test.Failure(
               'Test didn\'t complete (no context lost event?)')
         if not tab.EvaluateJavaScript(
           'window.domAutomationController._succeeded'):
           raise page_test.Failure(
             'Test failed (context not restored properly?)')
 
+class WebGLContextLostFromGPUProcessExitPage(page.Page):

[Ken Russell (switch to Gerrit), 2014/04/28 20:56:21]

This will collide with https://codereview.chromium.org/251443006/ . Could you
please wait for it to land and then rebase?

+  def __init__(self, page_set, base_dir):
+    super(WebGLContextLostFromGPUProcessExitPage, self).__init__(
+      url='file://webgl.html?query=kill_after_notification',
+      page_set=page_set,
+      base_dir=base_dir)
+    self.name = 'ContextLost.WebGLContextLostFromGPUProcessExit'
+    self.script_to_evaluate_on_commit = harness_script
+    self.kill_gpu_process = True
+    self.number_of_gpu_process_kills = 1
+
+  def RunNavigateSteps(self, action_runner):
+    action_runner.RunAction(NavigateAction())
+    action_runner.RunAction(WaitAction(
+      {'javascript': 'window.domAutomationController._loaded'}))
+
+
+class WebGLContextLostFromLoseContextExtensionPage(page.Page):
+  def __init__(self, page_set, base_dir):
+    super(WebGLContextLostFromLoseContextExtensionPage, self).__init__(
+      url='file://webgl.html?query=WEBGL_lose_context',
+      page_set=page_set,
+      base_dir=base_dir)
+    self.name = 'ContextLost.WebGLContextLostFromLoseContextExtension',
+    self.script_to_evaluate_on_commit = harness_script
+    self.kill_gpu_process = False
+
+  def RunNavigateSteps(self, action_runner):
+    action_runner.RunAction(NavigateAction())
+    action_runner.RunAction(WaitAction(
+      {'javascript': 'window.domAutomationController._finished'}))
+
+
 class ContextLost(test_module.Test):
   enabled = True
   test = _ContextLostValidator
   # For the record, this would have been another way to get the pages
   # to repeat. pageset_repeat would be another option.
   # options = {'page_repeat': 5}
   def CreatePageSet(self, options):
-    page_set_dict = {
-      'description': 'Test cases for real and synthetic context lost events',
-      'user_agent_type': 'desktop',
-      'serving_dirs': [''],
-      'pages': [
-        {
-          'name': 'ContextLost.WebGLContextLostFromGPUProcessExit',
-          'url': 'file://webgl.html?query=kill_after_notification',
-          'script_to_evaluate_on_commit': harness_script,
-          'navigate_steps': [
-            { 'action': 'navigate' },
-            { 'action': 'wait',
-              'javascript': 'window.domAutomationController._loaded' }
-          ],
-          'kill_gpu_process': True,
-          'number_of_gpu_process_kills': 1,
-        },
-        {
-          'name': 'ContextLost.WebGLContextLostFromLoseContextExtension',
-          'url': 'file://webgl.html?query=WEBGL_lose_context',
-          'script_to_evaluate_on_commit': harness_script,
-          'navigate_steps': [
-            { 'action': 'navigate' },
-            { 'action': 'wait',
-              'javascript': 'window.domAutomationController._finished' }
-          ],
-          'kill_gpu_process': False
-        },
-      ]
-    }
-    return page_set.PageSet.FromDict(page_set_dict, data_path)
+    ps = page_set.PageSet(
+      file_path=data_path,
+      description='Test cases for real and synthetic context lost events',
+      user_agent_type='desktop',
+      serving_dirs=set(['']))
+    ps.AddPage(WebGLContextLostFromGPUProcessExitPage(ps, ps.base_dir))
+    ps.AddPage(WebGLContextLostFromLoseContextExtensionPage(ps, ps.base_dir))
+    return ps