Rename android-webview-shell to android-webview-instrumentation

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
 import sys
 
 from gpu_tests import gpu_integration_test
 from gpu_tests import path_util
@@ skipping 270 matching lines @@
       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'):
+      browser.browser_type == 'android-webview-instrumentation'):
       # 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.
       browser_options.AppendExtraBrowserArgs([
         '--disable-gl-extensions=GL_EXT_disjoint_timer_query',
         '--ignore_egl_sync_failures',
       ])
@@ skipping 94 matching lines @@
           if webgl_version > 1:
             test += '?webglVersion=' + str(webgl_version)
           test_paths.append(test)
 
     return test_paths
 
 
 def load_tests(loader, tests, pattern):
   del loader, tests, pattern  # Unused.
   return gpu_integration_test.LoadAllTestsInModule(sys.modules[__name__])