Fix specifier simplification and add test.

third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_expectations_updater.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.
 
 """Updates layout test expectations and baselines when updating w3c tests.
 
 Specifically, this class fetches results from try bots for the current CL, then
 (1) downloads new baseline files for any tests that can be rebaselined, and
 (2) updates the generic TestExpectations file for any other failing tests.
 """
@@ skipping 261 matching lines @@
             test_name: The test name for the expectation line.
 
         Returns:
             The specifier part of the new expectation line, e.g. "[ Mac ]".
             This will be an empty string if the line should apply to all platforms.
         """
         specifiers = []
         for name in sorted(port_names):
             specifiers.append(self.host.builders.version_specifier_for_port_name(name))
         port = self.host.port_factory.get()
+        specifiers.extend(self.skipped_specifiers(test_name))
         specifiers = self.simplify_specifiers(specifiers, port.configuration_specifier_macros())
-        specifiers.extend(self.skipped_specifiers(test_name))
         if not specifiers:
             return ''
         return '[ %s ]' % ' '.join(specifiers)
 
     @staticmethod
     def to_list(tuple_or_value):
         """Converts a tuple to a list, and a string value to a one-item list."""
         if isinstance(tuple_or_value, tuple):
             return list(tuple_or_value)
         return [tuple_or_value]
@@ skipping 144 matching lines @@
                 This might correspond to a deleted file or a non-test.
         """
         absolute_path = self.host.filesystem.join(self.finder.layout_tests_dir(), test_path)
         test_parser = TestParser(absolute_path, self.host)
         if not test_parser.test_doc:
             return False
         return test_parser.is_jstest()
 
     def _get_try_bots(self):
         return self.host.builders.all_try_builder_names()