Get rid of the distinction between modifiers and expectations.

Tools/Scripts/webkitpy/tool/commands/queries.py

 # Copyright (c) 2009 Google Inc. All rights reserved.
 # Copyright (c) 2009 Apple Inc. All rights reserved.
 # Copyright (c) 2012 Intel Corporation. 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.
@@ skipping 52 matching lines @@
 
     def __init__(self):
         options = [
             make_option('--all', action='store_true', default=False,
                         help='display the expectations for *all* tests'),
             make_option('-x', '--exclude-keyword', action='append', default=[],
                         help='limit to tests not matching the given keyword (for example, "skip", "slow", or "crash". May specify multiple times'),
             make_option('-i', '--include-keyword', action='append', default=[],
                         help='limit to tests with the given keyword (for example, "skip", "slow", or "crash". May specify multiple times'),
             make_option('--csv', action='store_true', default=False,
-                        help='Print a CSV-style report that includes the port name, bugs, modifiers, tests, and expectations'),
+                        help='Print a CSV-style report that includes the port name, bugs, specifiers, tests, and expectations'),
             make_option('-f', '--full', action='store_true', default=False,
                         help='Print a full TestExpectations-style line for every match'),
             make_option('--paths', action='store_true', default=False,
                         help='display the paths for all applicable expectation files'),
         ] + platform_options(use_globs=True)
 
         AbstractDeclarativeCommand.__init__(self, options=options)
         self._expectation_models = {}
 
     def execute(self, options, args, tool):
@@ skipping 116 matching lines @@
                     print "%s,%s,%s,%s,%s,%s" % (port_name, test_name, self._platform_for_path(test_name),
                                                  extension[1:], baseline_location, self._platform_for_path(baseline_location))
                 else:
                     print baseline_location
 
     def _platform_for_path(self, relpath):
         platform_matchobj = self._platform_regexp.match(relpath)
         if platform_matchobj:
             return platform_matchobj.group(1)
         return None