Fix WebGL 2.0 expectations and skip a test with an assertion failure.

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:
@@ skipping 147 matching lines @@
     # For compatibility, the file:// scheme must be treated specially.
     # The top-level directory shows up in the netloc portion of the URL.
     if components[0] == 'file':
       url_path = components[1] + components[2]
     else:
       url_path = components[2]
     # Chop any leading slash since the expectations used by this class
     # assume that.
     if (url_path and url_path[0] == '/'):
       url_path = url_path[1:]
+    # Python's urlsplit doesn't seem to handle query arguments for
+    # file:// URLs properly. Split them off manually.
+    query_index = url_path.find('?')
+    if query_index > 0:
+      url_path = url_path[0:query_index]
     return url_path
 
   def _GetExpectationObjectForPage(self, browser, page):
     if not self._built_expectation_cache:
       self._BuildExpectationsCache(browser, page)
     # First attempt to look up by the page's URL or name.
     e = None
     # Relative URL (common case).
     url = self._GetNormalizedURL(page.url, browser)
     url_path = self._GetURLPath(url)
@@ skipping 60 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