Support --js-flags via --extra-browser-args in WebGL conformance tests.

content/test/gpu/gpu_tests/webgl_conformance_integration_test.py

 # Copyright 2016 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 logging
 import os
 
 from gpu_tests import gpu_integration_test
 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
 
 conformance_relcomps = (
@@ skipping 228 matching lines @@
   @classmethod
   def CustomizeOptions(cls):
     assert cls._webgl_version == 1 or cls._webgl_version == 2
     browser_options = cls._finder_options.browser_options
     # --test-type=gpu is used only to suppress the "Google API Keys are missing"
     # infobar, which causes flakiness in tests.
     browser_options.AppendExtraBrowserArgs([
         '--disable-gesture-requirement-for-media-playback',
         '--disable-domain-blocking-for-3d-apis',
         '--disable-gpu-process-crash-limit',
-        '--js-flags=--expose-gc',
         '--test-type=gpu',
         '--enable-experimental-canvas-features',
         # Try disabling the GPU watchdog to see if this affects the
         # intermittent GPU process hangs that have been seen on the
         # waterfall. crbug.com/596622 crbug.com/609252
         '--disable-gpu-watchdog'
     ])
+
+    builtin_js_flags = '--js-flags=--expose-gc'
+    found_js_flags = False
+    user_js_flags = ''
+    if browser_options.extra_browser_args:
+      for o in browser_options.extra_browser_args:
+        if o.startswith('--js-flags'):
+          found_js_flags = True
+          user_js_flags = o
+          break
+    if found_js_flags:
+      logging.warning('Overriding built-in JavaScript flags:')
+      logging.warning(' Original flags: ' + builtin_js_flags)
+      logging.warning(' New flags: ' + user_js_flags)
+    else:
+      browser_options.AppendExtraBrowserArgs([builtin_js_flags])
+
     if cls._webgl_version == 2:
       browser_options.AppendExtraBrowserArgs([
         '--enable-es3-apis',
       ])
     browser = browser_finder.FindBrowser(browser_options.finder_options)
     if (browser.target_os.startswith('android') and
       browser.browser_type == 'android-webview-shell'):
       # TODO(kbr): this is overly broad. We'd like to do this only on
       # Nexus 9. It'll go away shortly anyway. crbug.com/499928
       #
@@ skipping 94 matching lines @@
           # We only check min-version >= 2.0.0 for the top level list.
           test_paths += cls._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