Get rid of the distinction between modifiers and expectations.

Tools/Scripts/webkitpy/layout_tests/models/test_configuration_unittest.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 149 matching lines @@
         converter = TestConfigurationConverter(self._all_test_configurations)
 
         self.assertEqual(converter.to_config_set(set()), self._all_test_configurations)
 
         self.assertEqual(converter.to_config_set(set(['foo'])), set())
 
         self.assertEqual(converter.to_config_set(set(['xp', 'foo'])), set())
 
         errors = []
         self.assertEqual(converter.to_config_set(set(['xp', 'foo']), errors), set())
-        self.assertEqual(errors, ["Unrecognized modifier 'foo'"])
+        self.assertEqual(errors, ["Unrecognized specifier 'foo'"])
 
         self.assertEqual(converter.to_config_set(set(['xp', 'x86_64'])), set())
 
         configs_to_match = set([
             TestConfiguration('xp', 'x86', 'release'),
         ])
         self.assertEqual(converter.to_config_set(set(['xp', 'release'])), configs_to_match)
 
         configs_to_match = set([
             TestConfiguration('snowleopard', 'x86', 'release'),
@@ skipping 179 matching lines @@
             TestConfiguration('xp', 'x86', 'release'),
             TestConfiguration('vista', 'x86', 'release'),
             TestConfiguration('win7', 'x86', 'release'),
         ])
         self.assertEqual(converter.to_specifiers_list(configs_to_match), [set(['win', 'release'])])
 
     def test_specifier_converter_access(self):
         specifier_sorter = TestConfigurationConverter(self._all_test_configurations, MOCK_MACROS).specifier_sorter()
         self.assertEqual(specifier_sorter.category_for_specifier('snowleopard'), 'version')
         self.assertEqual(specifier_sorter.category_for_specifier('mac'), 'version')