Update lint-test-expectations to check on FlagExpectations

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.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 1298 matching lines @@
 
         for path in self.get_option('additional_expectations', []):
             expanded_path = self._filesystem.expanduser(path)
             if self._filesystem.exists(expanded_path):
                 _log.debug("reading additional_expectations from path '%s'", path)
                 expectations[path] = self._filesystem.read_text_file(expanded_path)
             else:
                 _log.warning("additional_expectations path '%s' does not exist", path)
         return expectations
 
+    def all_expectations_dict(self):
+        """Returns an OrderedDict of name -> expectations strings (see:
+        |expectations_dict|), including all flag-specific expectation files."""
+        expectations = self.expectations_dict()
+
+        flag_path = self._filesystem.join(self.layout_tests_dir(), 'FlagExpectations')
+        if not self._filesystem.exists(flag_path):
+            return expectations
+
+        for (_, _, filenames) in self._filesystem.walk(flag_path):
+            if 'README.txt' in filenames:
+                filenames.remove('README.txt')
+            for filename in filenames:
+                path = self._filesystem.join(flag_path, filename)
+                expectations[path] = self._filesystem.read_text_file(path)
+
+        return expectations
+
     def bot_expectations(self):
         if not self.get_option('ignore_flaky_tests'):
             return {}
 
         full_port_name = self.determine_full_port_name(self.host, self._options, self.port_name)
         builder_category = self.get_option('ignore_builder_category', 'layout')
         factory = BotTestExpectationsFactory(self.host.builders)
         # FIXME: This only grabs release builder's flakiness data. If we're running debug,
         # when we should grab the debug builder's data.
         expectations = factory.expectations_for_port(full_port_name, builder_category)
@@ skipping 485 matching lines @@
 
     def __init__(self, base, args, reference_args=None):
         self.name = base
         self.base = base
         self.args = args
         self.reference_args = args if reference_args is None else reference_args
         self.tests = set()
 
     def __repr__(self):
         return "PhysicalTestSuite('%s', '%s', %s, %s)" % (self.name, self.base, self.args, self.reference_args)