Add android-chromium as a browser type to GPU test expectations.

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, linux, chromeos,
 #     android
 #
 # Browser types:
 #     android-webview-shell, android-content-shell, debug, release
 #
 # 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']
 
 OS_CONDITIONS = ['win', 'mac', 'linux', 'chromeos', 'android'] + \
                 WIN_CONDITIONS + MAC_CONDITIONS
 
 BROWSER_TYPE_CONDITIONS = [
-    'android-webview-shell', 'android-content-shell', 'debug', 'release']
+    'android-webview-shell', 'android-content-shell', 'android-chromium',
+    'debug', 'release']
 
 class Expectation(object):
   """Represents a single test expectation for a page.
 
   Supports conditions based on operating system (e.g., win, mac) and
   browser type (e.g. 'debug', 'release').
 
   Subclass this class and call super.__init__ last in your constructor
   in order to add new user-defined conditions. The conditions are
   parsed at the end of this class's constructor, so be careful not to
@@ skipping 21 matching lines @@
     implementation will raise an exception if the condition is
     unsupported.
 
     Valid expectation conditions are:
 
     Operating systems:
       win, xp, vista, win7, mac, leopard, snowleopard, lion,
       mountainlion, mavericks, yosemite, linux, chromeos, android
 
     Browser types:
-      android-webview-shell, android-content-shell, debug, release
+      android-webview-shell, 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:
       self.browser_conditions.append(condition)
@@ skipping 170 matching lines @@
     platform = browser.platform
     os_matches = (not expectation.os_conditions or
         platform.GetOSName() in expectation.os_conditions or
         platform.GetOSVersionName() in expectation.os_conditions)
 
     browser_matches = (
       (not expectation.browser_conditions) or
       browser.browser_type in expectation.browser_conditions)
 
     return os_matches and browser_matches