Get rid of the distinction between modifiers and expectations.

Tools/Scripts/webkitpy/layout_tests/models/test_configuration.py

 # Copyright (C) 2011 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 139 matching lines @@
         if len(specifier_set) == 0:
             return copy.copy(self._all_test_configurations)
 
         matching_sets = {}
 
         for specifier in specifier_set:
             for expanded_specifier in self._expand_macros(specifier):
                 configurations = self._specifier_to_configuration_set.get(expanded_specifier)
                 if not configurations:
                     if error_list is not None:
-                        error_list.append("Unrecognized modifier '" + expanded_specifier + "'")
+                        error_list.append("Unrecognized specifier '" + expanded_specifier + "'")
                     return set()
                 category = self._specifier_sorter.category_for_specifier(expanded_specifier)
                 matching_sets.setdefault(category, set()).update(configurations)
 
         return reduce(set.intersection, matching_sets.values())
 
     @classmethod
     def collapse_macros(cls, macros_dict, specifiers_list):
         for macro_specifier, macro in macros_dict.items():
             if len(macro) == 1:
@@ skipping 55 matching lines @@
     def symmetric_difference(cls, iterable):
         union = set()
         intersection = iterable[0]
         for item in iterable:
             union = union | item
             intersection = intersection.intersection(item)
         return union - intersection
 
     def to_specifiers_list(self, test_configuration_set):
         """Convert a set of TestConfiguration instances into one or more list of specifiers."""
-        # Easy out: if the set is all configurations, the modifier is empty.
+        # Easy out: if the set is all configurations, the specifier is empty.
         if len(test_configuration_set) == len(self._all_test_configurations):
             return [[]]
 
         # 1) Build a list of specifier sets, discarding specifiers that don't add value.
         specifiers_list = []
         for config in test_configuration_set:
             values = set(config.values())
             for specifier, junk_specifier_set in self._junk_specifier_combinations.items():
                 if specifier in values:
                     values -= junk_specifier_set
@@ skipping 52 matching lines @@
         specifiers_to_remove = []
         for specifier_set in specifiers_list:
             if macro_keys <= specifier_set:
                 specifiers_to_remove.append(specifier_set)
 
         for specifier_set in specifiers_to_remove:
             specifiers_list.remove(specifier_set)
             specifiers_list.append(frozenset(specifier_set - macro_keys))
 
         return specifiers_list