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

content/test/gpu/gpu_tests/test_expectations.py

 # Copyright 2013 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 fnmatch
 import urlparse
 
 # Valid expectation conditions are:
 #
 # Operating systems:
 #     win, xp, vista, win7, win8, win10, mac, leopard, snowleopard,
 #     lion, mountainlion, mavericks, yosemite, sierra, linux, chromeos,
 #     android
 #
 # Browser types:
-#     android-webview-shell, android-content-shell, debug, release
+#     android-webview-instrumentation, android-content-shell, debug, release
 #
 # ASAN conditions:
 #     asan, no_asan
 #
 # Sample usage in SetExpectations in subclasses:
 #   self.Fail('gl-enable-vertex-attrib.html',
 #       ['mac', 'release'], bug=123)
 
 WIN_CONDITIONS = ['xp', 'vista', 'win7', 'win8', 'win10']
 MAC_CONDITIONS = ['leopard', 'snowleopard', 'lion', 'mountainlion',
                   'mavericks', 'yosemite', 'sierra']
 
 OS_CONDITIONS = ['win', 'mac', 'linux', 'chromeos', 'android'] + \
                 WIN_CONDITIONS + MAC_CONDITIONS
 
 BROWSER_TYPE_CONDITIONS = [
-    'android-webview-shell', 'android-content-shell', 'android-chromium',
-    'debug', 'release']
+    'android-webview-instrumentation', 'android-content-shell',
+    'android-chromium', 'debug', 'release']
 
 ASAN_CONDITIONS = ['asan', 'no_asan']
 
 def _SafeLower(opt_str):
   if not opt_str:
     return opt_str
   return opt_str.lower()
 
 
 class Expectation(object):
@@ skipping 38 matching lines @@
     unsupported.
 
     Valid expectation conditions are:
 
     Operating systems:
       win, xp, vista, win7, mac, leopard, snowleopard, lion,
       mountainlion, mavericks, yosemite, sierra, linux, chromeos,
       android
 
     Browser types:
-      android-webview-shell, android-content-shell, android-chromium,
-      debug, release
+      android-webview-instrumentation, android-content-shell,
+      android-chromium, debug, release
 
     Sample usage in SetExpectations in subclasses:
       self.Fail('gl-enable-vertex-attrib.html',
          ['mac', 'release'], bug=123)
 
     """
     cl = condition.lower()
     if cl in OS_CONDITIONS:
       self.os_conditions.append(cl)
     elif cl in BROWSER_TYPE_CONDITIONS:
@@ skipping 196 matching lines @@
     browser_matches = (
       (not expectation.browser_conditions) or
       _SafeLower(browser.browser_type) in expectation.browser_conditions)
 
     asan_matches = (
       (not expectation.asan_conditions) or
       ('asan' in expectation.asan_conditions and self._is_asan) or
       ('no_asan' in expectation.asan_conditions and not self._is_asan))
 
     return os_matches and browser_matches and asan_matches