Revert of Added tests to check that WebGL extensions are available.

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 os
 
 from gpu_tests import gpu_test_base
 from gpu_tests import path_util
 from gpu_tests import webgl_conformance_expectations
 from gpu_tests import webgl2_conformance_expectations
 
 from telemetry.internal.browser import browser_finder
 from telemetry.page import page_test
 from telemetry.story.story_set import StorySet
 
-extensions_path = os.path.join(
-    path_util.GetChromiumSrcDir(),
-    'content', 'test', 'data', 'gpu')
+
 conformance_path = os.path.join(
     path_util.GetChromiumSrcDir(),
     'third_party', 'webgl', 'src', 'sdk', 'tests')
 
 conformance_harness_script = r"""
   var testHarness = {};
   testHarness._allTestSucceeded = true;
   testHarness._messages = '';
   testHarness._failures = 0;
   testHarness._finished = false;
@@ skipping 93 matching lines @@
         '--test-type=gpu',
         '--enable-experimental-canvas-features'
     ])
     browser = browser_finder.FindBrowser(options.finder_options)
     if browser.target_os == 'darwin':
       # crbug.com/539993
       options.AppendExtraBrowserArgs([
           '--disable-accelerated-video-decode'
       ])
 
-class WebglExtensionPage(gpu_test_base.PageBase):
-  def __init__(self, story_set, extension, webgl_version, expectations):
-    super(WebglExtensionPage, self).__init__(
-      url='file://' + extensions_path + '/webgl_extension_test.html',
-      page_set=story_set, base_dir=extensions_path,
-      shared_page_state_class=gpu_test_base.DesktopGpuSharedPageState,
-      name=('WebglExtension.%s' % extension),
-      expectations=expectations)
-    self.extension = extension
-    self.context_type = "webgl2" if webgl_version == 2 else "webgl"
-    self.script_to_evaluate_on_commit = conformance_harness_script
-
-  def RunNavigateSteps(self, action_runner):
-    super(WebglExtensionPage, self).RunNavigateSteps(action_runner)
-    action_runner.EvaluateJavaScript('checkExtension("%s", "%s")' %
-        (self.extension, self.context_type))
-    action_runner.WaitForJavaScriptCondition(
-        'webglTestHarness._finished', timeout_in_seconds=3)
-
-class WebglExtensionListPage(gpu_test_base.PageBase):
-  def __init__(self, story_set, extension_list, webgl_version, expectations):
-    super(WebglExtensionListPage, self).__init__(
-      url='file://' + extensions_path + '/webgl_extension_test.html',
-      page_set=story_set, base_dir=extensions_path,
-      shared_page_state_class=gpu_test_base.DesktopGpuSharedPageState,
-      name=('WebglExtension.TestCoverage'),
-      expectations=expectations)
-    self.extension_list = extension_list
-    self.context_type = "webgl2" if webgl_version == 2 else "webgl"
-    self.script_to_evaluate_on_commit = conformance_harness_script
-
-  def RunNavigateSteps(self, action_runner):
-    super(WebglExtensionListPage, self).RunNavigateSteps(action_runner)
-    extension_list_string = "["
-    for extension in self.extension_list:
-      extension_list_string = extension_list_string + extension + ", "
-    extension_list_string = extension_list_string + "]"
-    action_runner.EvaluateJavaScript('checkSupportedExtensions("%s", "%s")' %
-        (extension_list_string, self.context_type))
-    action_runner.WaitForJavaScriptCondition(
-        'webglTestHarness._finished', timeout_in_seconds=3)
-
 class WebglConformancePage(gpu_test_base.PageBase):
   def __init__(self, story_set, test, expectations):
     super(WebglConformancePage, self).__init__(
       url='file://' + test, page_set=story_set, base_dir=story_set.base_dir,
       shared_page_state_class=gpu_test_base.DesktopGpuSharedPageState,
       name=('WebglConformance.%s' %
               test.replace('/', '_').replace('-', '_').
                  replace('\\', '_').rpartition('.')[0].replace('.', '_')),
       expectations=expectations)
     self.script_to_evaluate_on_commit = conformance_harness_script
@@ skipping 33 matching lines @@
         options.webgl_conformance_version,
         (options.webgl2_only == 'true'),
         None)
 
     self._webgl_version = [
         int(x) for x in options.webgl_conformance_version.split('.')][0]
 
     ps = StorySet(serving_dirs=[''], base_dir=conformance_path)
 
     expectations = self.GetExpectations()
-
-    extension_tests = self.GetExtensionList()
-    ps.AddStory(WebglExtensionListPage(ps, extension_tests, self._webgl_version,
-          expectations))
-    for extension in extension_tests:
-      ps.AddStory(WebglExtensionPage(ps, extension, self._webgl_version,
-          expectations))
-
     for test in tests:
       ps.AddStory(WebglConformancePage(ps, test, expectations))
 
     return ps
 
   def _CreateExpectations(self):
     assert self._webgl_version == 1 or self._webgl_version == 2
     if self._webgl_version == 1:
       return webgl_conformance_expectations.WebGLConformanceExpectations(
           conformance_path)
     else:
       return webgl2_conformance_expectations.WebGL2ConformanceExpectations(
           conformance_path)
 
-  def GetExtensionList(self):
-    if self._webgl_version == 1:
-      return [
-        'ANGLE_instanced_arrays',
-        'EXT_blend_minmax',
-        'EXT_disjoint_timer_query',
-        'EXT_frag_depth',
-        'EXT_shader_texture_lod',
-        'EXT_sRGB',
-        'EXT_texture_filter_anisotropic',
-        'OES_element_index_uint',
-        'OES_standard_derivatives',
-        'OES_texture_float',
-        'OES_texture_float_linear',
-        'OES_texture_half_float',
-        'OES_texture_half_float_linear',
-        'OES_vertex_array_object',
-        'WEBGL_compressed_texture_astc',
-        'WEBGL_compressed_texture_atc',
-        'WEBGL_compressed_texture_etc1',
-        'WEBGL_compressed_texture_pvrtc',
-        'WEBGL_compressed_texture_s3tc',
-        'WEBGL_debug_renderer_info',
-        'WEBGL_debug_shaders',
-        'WEBGL_depth_texture',
-        'WEBGL_draw_buffers',
-        'WEBGL_lose_context',
-      ]
-    else:
-      return [
-        'EXT_color_buffer_float',
-        'EXT_disjoint_timer_query',
-        'EXT_texture_filter_anisotropic',
-        'OES_texture_float_linear',
-        'WEBGL_compressed_texture_astc',
-        'WEBGL_compressed_texture_atc',
-        'WEBGL_compressed_texture_etc1',
-        'WEBGL_compressed_texture_pvrtc',
-        'WEBGL_compressed_texture_s3tc',
-        'WEBGL_debug_renderer_info',
-        'WEBGL_debug_shaders',
-        'WEBGL_lose_context',
-      ]
-
   @staticmethod
   def _ParseTests(path, version, webgl2_only, folder_min_version):
     test_paths = []
     current_dir = os.path.dirname(path)
     full_path = os.path.normpath(os.path.join(conformance_path, path))
     webgl_version = int(version.split('.')[0])
 
     if not os.path.exists(full_path):
       raise Exception('The WebGL conformance test path specified ' +
         'does not exist: ' + full_path)
@@ skipping 36 matching lines @@
           # We only check min-version >= 2.0.0 for the top level list.
           test_paths += WebglConformance._ParseTests(
               include_path, version, webgl2_only, min_version_to_compare)
         else:
           test = os.path.join(current_dir, test_name)
           if webgl_version > 1:
             test += '?webglVersion=' + str(webgl_version)
           test_paths.append(test)
 
     return test_paths