Replace webkitpy standalone builders functions with instantiable class.

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/factory.py

Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/factory.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/factory.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/factory.py
index db878a06a86ae6f7bd6184b1bb9b875c0dbc4940..3c92115394f7fec1c8ffe280cc3a9bd1eccc1f32 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/factory.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/factory.py
@@ -33,8 +33,7 @@ import optparse
 import re
 
 from webkitpy.common.webkit_finder import WebKitFinder
-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, since builders is an attribute of host, we
don't use it directly in this module now I think.

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

Done.

 
 def platform_options(use_globs=False):
     return [
@@ -186,9 +185,9 @@ class PortFactory(object):
 
         If platform is not specified, we will glob-match all ports"""
         platform = platform or '*'
-        return fnmatch.filter(builders.all_port_names(), platform)
+        return fnmatch.filter(self._host.builders.all_port_names(), platform)
 
     def get_from_builder_name(self, builder_name):
-        port_name = builders.port_name_for_builder_name(builder_name)
+        port_name = self._host.builders.port_name_for_builder_name(builder_name)
         assert port_name, "unrecognized builder name '%s'" % builder_name
         return self.get(port_name, _builder_options(builder_name))