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

content/test/gpu/gpu_tests/screenshot_sync.py

 # Copyright 2014 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
 
 import screenshot_sync_expectations as expectations
 
 from telemetry import test
 from telemetry.core import util
+from telemetry.page import page
 from telemetry.page import page_set
 from telemetry.page import page_test
+# pylint: disable=W0401,W0614
+from telemetry.page.actions.all_page_actions import *
 
 data_path = os.path.join(
     util.GetChromiumSrcDir(), 'content', 'test', 'data', 'gpu')
 
 class _ScreenshotSyncValidator(page_test.PageTest):
   def __init__(self):
     super(_ScreenshotSyncValidator, self).__init__('ValidatePage')
 
   def CustomizeBrowserOptions(self, options):
     options.AppendExtraBrowserArgs('--enable-gpu-benchmarking')
 
   def ValidatePage(self, page, tab, results):
     test_success = tab.EvaluateJavaScript('window.__testSuccess')
     if not test_success:
       message = tab.EvaluateJavaScript('window.__testMessage')
       raise page_test.Failure(message)
 
+
+class ScreenshotSyncPage(page.Page):
+  def __init__(self, page_set, base_dir):
+    super(ScreenshotSyncPage, self).__init__(
+      url='file://screenshot_sync.html',
+      page_set=page_set,
+      base_dir=base_dir)
+    self.name = 'ScreenshotSync'
+    self.user_agent_type = 'desktop'
+
+  def RunNavigateSteps(self, action_runner):
+    action_runner.RunAction(NavigateAction())
+    action_runner.RunAction(WaitAction({
+      'javascript': 'window.__testComplete',
+      'timeout': 120}))
+
+
 class ScreenshotSyncProcess(test.Test):
   """Tests that screenhots are properly synchronized with the frame one which
   they were requested"""
   test = _ScreenshotSyncValidator
 
   def CreateExpectations(self, page_set):
     return expectations.ScreenshotSyncExpectations()
 
   def CreatePageSet(self, options):
-    page_set_dict = {
-      'description': 'Test cases for screenshot synchronization',
-      'user_agent_type': 'desktop',
-      'serving_dirs': [''],
-      'pages': [
-        {
-          'name': 'ScreenshotSync',
-          'url': 'file://screenshot_sync.html',
-          'navigate_steps': [
-            { 'action': 'navigate' },
-            { 'action': 'wait',
-              'javascript': 'window.__testComplete',
-              'timeout': 120 }
-          ]
-        }
-      ]
-    }
-    return page_set.PageSet.FromDict(page_set_dict, data_path)
+    ps = page_set.PageSet(
+      file_path=data_path,
+      description='Test cases for screenshot synchronization',
+      serving_dirs=[''])
+    ps.AddPage(ScreenshotSyncPage(ps, ps.base_dir))
+    return ps