Get rid of the distinction between modifiers and expectations.

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

Index: Tools/Scripts/webkitpy/layout_tests/layout_package/bot_test_expectations.py
diff --git a/Tools/Scripts/webkitpy/layout_tests/layout_package/bot_test_expectations.py b/Tools/Scripts/webkitpy/layout_tests/layout_package/bot_test_expectations.py
index 35c54d48ac758bd9c6ba84fbcb631301629a992d..4782c1aea5fc5df895648f8a54a5b44461916f07 100644
--- a/Tools/Scripts/webkitpy/layout_tests/layout_package/bot_test_expectations.py
+++ b/Tools/Scripts/webkitpy/layout_tests/layout_package/bot_test_expectations.py
@@ -143,7 +143,7 @@ class BotTestExpectations(object):
         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
 
@@ -161,8 +161,7 @@ class BotTestExpectations(object):
     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,
@@ -170,9 +169,6 @@ class BotTestExpectations(object):
             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 = {}