Add "--test-type=gpu" to suppress API Keys InfoBar

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 optparse
 import os
 import sys
 
 import gpu_test_base
 import path_util
@@ skipping 64 matching lines @@
 
 class WebglConformanceValidator(gpu_test_base.ValidatorBase):
   def __init__(self):
     super(WebglConformanceValidator, self).__init__()
 
   def ValidateAndMeasurePage(self, page, tab, results):
     if not _DidWebGLTestSucceed(tab):
       raise page_test.Failure(_WebGLTestMessages(tab))
 
   def CustomizeBrowserOptions(self, options):
+    # --test-type=gpu is used only to suppress the "Google API Keys are missing"
+    # infobar, which causes flakiness in tests.
     options.AppendExtraBrowserArgs([
         '--disable-gesture-requirement-for-media-playback',
         '--disable-domain-blocking-for-3d-apis',
-        '--disable-gpu-process-crash-limit'
+        '--disable-gpu-process-crash-limit',
+        '--test-type=gpu'
     ])
     browser = browser_finder.FindBrowser(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
         #
         # The --ignore_egl_sync_failures is only there to work around
         # some strange failure on the Nexus 9 bot, not reproducible on
         # local hardware.
         options.AppendExtraBrowserArgs([
             '--disable-gl-extensions=GL_EXT_disjoint_timer_query',
             '--ignore_egl_sync_failures'
         ])
 
 
 class Webgl2ConformanceValidator(WebglConformanceValidator):
   def __init__(self):
     super(Webgl2ConformanceValidator, self).__init__()
 
   def CustomizeBrowserOptions(self, options):
+    # --test-type=gpu is used only to suppress the "Google API Keys are missing"
+    # infobar, which causes flakiness in tests.
     options.AppendExtraBrowserArgs([
         '--disable-gesture-requirement-for-media-playback',
         '--disable-domain-blocking-for-3d-apis',
         '--disable-gpu-process-crash-limit',
-        '--enable-unsafe-es3-apis'
+        '--enable-unsafe-es3-apis',
+        '--test-type=gpu'
     ])
 
 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('.', '_')),
@@ skipping 105 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