Removing Page.WaitToLoad and update all pagesets to use explicit wait actions

content/test/gpu/gpu_tests/webgl_conformance.py

 # Copyright (c) 2012 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 json
 import os
 import sys
 
 import webgl_conformance_expectations
 
 from telemetry import test as test_module
@@ skipping 66 matching lines @@
       'serving_dirs': [ '' ],
       'pages': []
     }
 
     pages = page_set_dict['pages']
 
     for test in tests:
       pages.append({
         'url': 'file:///' + test,
         'script_to_evaluate_on_commit': conformance_harness_script,
-        'wait_for_javascript_expression': 'webglTestHarness._finished'
+        'navigate_steps': [
+          {'action': 'navigate'},
+          {
+            'action': 'wait',
+            'condition': 'javascript',
+            'javascript': 'webglTestHarness._finished'
+          }
+        ]
       })
 
     return page_set.PageSet.FromDict(page_set_dict, conformance_path)
 
   def CreateExpectations(self, page_set):
     return webgl_conformance_expectations.WebGLConformanceExpectations()
 
   @staticmethod
   def _ParseTests(path, version=None):
     test_paths = []
@@ skipping 32 matching lines @@
 
         if '.txt' in test_name:
           include_path = os.path.join(current_dir, test_name)
           test_paths += WebglConformance._ParseTests(
             include_path, version)
         else:
           test = os.path.join(current_dir, test_name)
           test_paths.append(test)
 
     return test_paths