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

content/test/gpu/gpu_tests/test_expectations_unittest.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 unittest
 
 from gpu_tests import test_expectations
 
 class StubPlatform(object):
   def __init__(self, os_name, os_version_name=None):
     self.os_name = os_name
@@ skipping 45 matching lines @@
   def SetExpectations(self):
     self.Fail('page1.html', ['win', 'mac'], bug=123)
     self.Fail('page2.html', ['vista'], bug=123)
     self.Fail('page3.html', bug=123)
     self.Fail('page4.*', bug=123)
     self.Fail('Pages.page_6')
     self.Fail('page7.html', ['mountainlion'])
     self.Fail('page8.html', ['mavericks'])
     self.Fail('page9.html', ['yosemite'])
     # Test browser conditions.
-    self.Fail('page10.html', ['android', 'android-webview-shell'], bug=456)
+    self.Fail('page10.html', ['android', 'android-webview-instrumentation'],
+              bug=456)
     # Test user defined conditions.
     self.Fail('page11.html', ['win', 'valid_condition_matched'])
     self.Fail('page12.html', ['win', 'valid_condition_unmatched'])
     # Test file:// scheme.
     self.Fail('conformance/attribs/page13.html')
     # Test file:// scheme on Windows.
     self.Fail('conformance/attribs/page14.html', ['win'])
     # Explicitly matched paths have precedence over wildcards.
     self.Fail('conformance/glsl/*')
     self.Skip('conformance/glsl/page15.html')
@@ skipping 114 matching lines @@
                                  StubPlatform('mac', 'mavericks'))
     self.assertExpectationEquals('fail', url,
                                  StubPlatform('mac', 'yosemite'))
 
   # Test browser type conditions.
   def testBrowserTypeConditions(self):
     url = 'http://test.com/page10.html'
     self.assertExpectationEquals('pass', url, StubPlatform('android'),
                                  browser_type='android-content-shell')
     self.assertExpectationEquals('fail', url, StubPlatform('android'),
-                                 browser_type='android-webview-shell')
+                                 browser_type='android-webview-instrumentation')
 
   # Tests with user-defined conditions.
   def testUserDefinedConditions(self):
     url = 'http://test.com/page11.html'
     self.assertExpectationEquals('fail', url, StubPlatform('win'))
     url = 'http://test.com/page12.html'
     self.assertExpectationEquals('pass', url, StubPlatform('win'))
 
   # The file:// scheme is treated specially by Telemetry; it's
   # translated into an HTTP request against localhost. Expectations
@@ skipping 39 matching lines @@
       'Foo',
       StubPlatform('win'))
 
   def testCaseInsensitivity(self):
     url = 'http://test.com/page1.html'
     self.assertExpectationEquals('fail', url, StubPlatform('Win'))
     url = 'http://test.com/page2.html'
     self.assertExpectationEquals('fail', url, StubPlatform('Win', 'Vista'))
     url = 'http://test.com/page10.html'
     self.assertExpectationEquals('fail', url, StubPlatform('android'),
-                                 browser_type='Android-Webview-Shell')
+                                 browser_type='Android-Webview-Instrumentation')
 
   def testASANExpectations(self):
     url16 = 'page16.html'
     url18 = 'page18.html'
     self.assertExpectationEquals('pass', url16, StubPlatform('mac'))
     self.assertExpectationEquals('fail', url18, StubPlatform('mac'))
     self.setUpHelper(is_asan=True)
     self.assertExpectationEquals('fail', url16, StubPlatform('mac'))
     self.assertExpectationEquals('skip', url18, StubPlatform('mac'))