Get rid of the distinction between modifiers and expectations.

Tools/Scripts/webkitpy/style/checkers/test_expectations.py

 # Copyright (C) 2010 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 48 matching lines @@
         self._port_obj = host.port_factory.get()
 
         # Suppress error messages of test_expectations module since they will be reported later.
         log = logging.getLogger("webkitpy.layout_tests.layout_package.test_expectations")
         log.setLevel(logging.CRITICAL)
 
     def _handle_error_message(self, lineno, message, confidence):
         pass
 
     def check_test_expectations(self, expectations_str, tests=None):
-        parser = TestExpectationParser(self._port_obj, tests, allow_rebaseline_modifier=False)
+        parser = TestExpectationParser(self._port_obj, tests, allow_rebaseline=False)
         expectations = parser.parse('expectations', expectations_str)
 
         level = 5
         for expectation_line in expectations:
             for warning in expectation_line.warnings:
                 self._handle_style_error(expectation_line.line_numbers, 'test/expectations', level, warning)
 
     def check_tabs(self, lines):
         self._tab_checker.check(lines)
 
     def check(self, lines):
         expectations = '\n'.join(lines)
         if self._port_obj:
             self.check_test_expectations(expectations_str=expectations, tests=None)
 
         # Warn tabs in lines as well
         self.check_tabs(lines)