Get rid of the distinction between modifiers and expectations.

Tools/Scripts/webkitpy/layout_tests/lint_test_expectations.py

 # Copyright (C) 2012 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 46 matching lines @@
         if options.platform == 'chromium':
             options.platform = None
 
         ports_to_lint = [host.port_factory.get(name) for name in host.port_factory.all_port_names(options.platform)]
         files_linted = set()
         lint_failed = False
 
         for port_to_lint in ports_to_lint:
             expectations_dict = port_to_lint.expectations_dict()
 
-            # FIXME: This won't work if multiple ports share a TestExpectations file but support different modifiers in the file.
             for expectations_file in expectations_dict.keys():
                 if expectations_file in files_linted:
                     continue
 
                 try:
                     test_expectations.TestExpectations(port_to_lint,
                         expectations_dict={expectations_file: expectations_dict[expectations_file]},
                         is_lint_mode=True)
                 except test_expectations.ParseError as e:
                     lint_failed = True
@@ skipping 29 matching lines @@
     try:
         exit_status = lint(host, options, stderr)
     except KeyboardInterrupt:
         exit_status = INTERRUPTED_EXIT_STATUS
     except Exception as e:
         print >> stderr, '\n%s raised: %s' % (e.__class__.__name__, str(e))
         traceback.print_exc(file=stderr)
         exit_status = EXCEPTIONAL_EXIT_STATUS
 
     return exit_status