Replace webkitpy standalone builders functions with instantiable class.

third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/flakytests.py

 # Copyright (c) 2011 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 14 matching lines @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import logging
 import os
 import optparse
 from webkitpy.tool.multicommandtool import AbstractDeclarativeCommand
 from webkitpy.layout_tests.layout_package.bot_test_expectations import BotTestExpectationsFactory
 from webkitpy.layout_tests.models.test_expectations import TestExpectationParser, TestExpectationsModel, TestExpectations
-from webkitpy.layout_tests.port import builders
+from webkitpy.layout_tests.port.builders import Builders

[qyearsley, 2016/05/02 21:56:36]

This import may be unnecessary now. I don't see where it's used in this module
currently -- does importing it have some side-effect that is required for this
command?

[bokan, 2016/05/04 11:58:47]

Done.

 from webkitpy.common.net import sheriff_calendar
 
 
 _log = logging.getLogger(__name__)
 
 
 class FlakyTests(AbstractDeclarativeCommand):
     name = "print-flaky-tests"
     help_text = "Print out flaky lines from the flakiness dashboard"
     show_in_main_help = True
@@ skipping 54 matching lines @@
 
         final_model = None
         for model in models:
             if final_model:
                 final_model.merge_model(model)
             else:
                 final_model = model
         return final_model._test_to_expectation_line.values()
 
     def execute(self, options, args, tool):
-        factory = self.expectations_factory()
-        lines = self._collect_expectation_lines(builders.all_builder_names(), factory)
+        factory = self.expectations_factory(tool.builders)
+        lines = self._collect_expectation_lines(tool.builders.all_builder_names(), factory)
         lines.sort(key=lambda line: line.path)
 
         port = tool.port_factory.get()
         # Skip any tests which are mentioned in the dashboard but not in our checkout:
         fs = tool.filesystem
         lines = filter(lambda line: fs.exists(fs.join(port.layout_tests_dir(), line.path)), lines)
 
         test_names = [line.name for line in lines]
         flakiness_dashbord_url = self.FLAKINESS_DASHBOARD_URL % ','.join(test_names)
         expectations_string = TestExpectations.list_to_string(lines)
 
         # pylint: disable=E1601
         print self.OUTPUT % (self.HEADER, expectations_string, flakiness_dashbord_url)