Get rid of the distinction between modifiers and expectations.

Tools/Scripts/webkitpy/layout_tests/layout_package/bot_test_expectations.py

 # Copyright (C) 2013 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 125 matching lines @@
     RESULT_TYPES_TO_IGNORE = ['N', 'X', 'Y']
 
     def __init__(self, results_json):
         self.results_json = results_json
 
     def _line_from_test_and_flaky_types_and_bug_urls(self, test_path, flaky_types, bug_urls):
         line = TestExpectationLine()
         line.original_string = test_path
         line.name = test_path
         line.filename = test_path
-        line.modifiers = bug_urls if bug_urls else ""
+        line.specifiers = bug_urls if bug_urls else ""
         line.expectations = sorted(map(self.results_json.expectation_for_type, flaky_types))
         return line
 
     def flakes_by_path(self, only_ignore_very_flaky):
         """Sets test expectations to bot results if there are at least two distinct results."""
         flakes_by_path = {}
         for test_path, entry in self.results_json.walk_results():
             results_dict = entry[self.results_json.RESULTS_KEY]
             flaky_types = self._flaky_types_in_results(results_dict, only_ignore_very_flaky)
             if len(flaky_types) <= 1:
                 continue
             flakes_by_path[test_path] = sorted(map(self.results_json.expectation_for_type, flaky_types))
         return flakes_by_path
 
     def unexpected_results_by_path(self):
         """For tests with unexpected results, returns original expectations + results."""
         def exp_to_string(exp):
-            return (TestExpectations.EXPECTATIONS_TO_STRING.get(exp, None) or
-                    TestExpectations.MODIFIERS_TO_STRING.get(exp, None)).upper()
+            return TestExpectations.EXPECTATIONS_TO_STRING.get(exp, None).upper()
 
         def string_to_exp(string):
             # Needs a bit more logic than the method above,
             # since a PASS is 0 and evaluates to False.
             result = TestExpectations.EXPECTATIONS.get(string.lower(), None)
             if not result is None:
                 return result
-            result = TestExpectations.MODIFIERS.get(string.lower(), None)
-            if not result is None:
-                return result
             raise ValueError(string)
 
         unexpected_results_by_path = {}
         for test_path, entry in self.results_json.walk_results():
             # Expectations for this test. No expectation defaults to PASS.
             exp_string = entry.get(self.results_json.EXPECTATIONS_KEY, u'PASS')
 
             # All run-length-encoded results for this test.
             results_dict = entry.get(self.results_json.RESULTS_KEY, {})
 
@@ skipping 46 matching lines @@
                 # Otherwise, we include lots of false-positives due to tests that fail
                 # for a couple runs and then start passing.
                 # FIXME: Maybe we should make this more liberal and consider it a flake
                 # even if we only see that failure once.
                 seen_results[result_type] = True
                 continue
 
             results_map[result_type] = True
 
         return results_map.keys()