Get rid of the distinction between modifiers and expectations.

Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py

 # Copyright (C) 2010 Google Inc. All rights reserved.
 # Copyright (C) 2010 Gabor Rapcsanyi (rgabor@inf.u-szeged.hu), University of Szeged
 #
 # 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
@@ skipping 129 matching lines @@
     results['skipped'] = len(tbt[test_expectations.NOW] & tbe[test_expectations.SKIP])
 
     num_passes = 0
     num_flaky = 0
     num_missing = 0
     num_regressions = 0
     keywords = {}
     for expecation_string, expectation_enum in test_expectations.TestExpectations.EXPECTATIONS.iteritems():
         keywords[expectation_enum] = expecation_string.upper()
 
-    for modifier_string, modifier_enum in test_expectations.TestExpectations.MODIFIERS.iteritems():
-        keywords[modifier_enum] = modifier_string.upper()
-
     num_failures_by_type = {}
     for expectation in initial_results.tests_by_expectation:
         num_failures_by_type[keywords[expectation]] = len(initial_results.tests_by_expectation[expectation] & tbt[test_expectations.NOW])
     # The number of failures by type.
     results['num_failures_by_type'] = num_failures_by_type
 
     tests = {}
 
     for test_name, result in initial_results.results_by_name.iteritems():
         # Note that if a test crashed in the original run, we ignore
@@ skipping 113 matching lines @@
     except Exception, e:
         _log.warn("Failed to determine svn revision for checkout (cwd: %s, webkit_base: %s), leaving 'revision' key blank in full_results.json.\n%s" % (port_obj._filesystem.getcwd(), port_obj.path_from_webkit_base(), e))
         # Handle cases where we're running outside of version control.
         import traceback
         _log.debug('Failed to learn head svn revision:')
         _log.debug(traceback.format_exc())
         results['chromium_revision'] = ""
         results['blink_revision'] = ""
 
     return results