Remove Command.bind_to_tool.

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

 # Copyright (c) 2009 Google Inc. All rights reserved.
 # Copyright (c) 2009 Apple Inc. All rights reserved.
 # Copyright (c) 2012 Intel Corporation. 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.
@@ skipping 92 matching lines @@
             files = default_port.expectations_files()
             layout_tests_dir = default_port.layout_tests_dir()
             for file in files:
                 if file.startswith(layout_tests_dir):
                     file = file.replace(layout_tests_dir, 'LayoutTests')
                 print file
             return
 
         tests = set(default_port.tests(args))
         for port_name in port_names:
-            model = self._model(options, port_name, tests)
+            port = tool.port_factory.get(port_name, options)
+            model = TestExpectations(port, tests).model()
             tests_to_print = self._filter_tests(options, model, tests)
             lines = [model.get_expectation_line(test) for test in sorted(tests_to_print)]
             if port_name != port_names[0]:
                 print
             print '\n'.join(self._format_lines(options, port_name, lines))
 
     def _filter_tests(self, options, model, tests):
         filtered_tests = set()
         if options.include_keyword:
             for keyword in options.include_keyword:
@@ skipping 11 matching lines @@
             for line in lines:
                 output.append("%s,%s" % (port_name, line.to_csv()))
         elif lines:
             include_modifiers = options.full
             include_expectations = options.full or len(options.include_keyword) != 1 or len(options.exclude_keyword)
             output.append("// For %s" % port_name)
             for line in lines:
                 output.append("%s" % line.to_string(None, include_modifiers, include_expectations, include_comment=False))
         return output
 
-    def _model(self, options, port_name, tests):
-        port = self._tool.port_factory.get(port_name, options)
-        return TestExpectations(port, tests).model()
-
 
 class PrintBaselines(Command):
     name = 'print-baselines'
     help_text = 'Prints the baseline locations for given test(s) on the given port(s)'
     show_in_main_help = True
 
     def __init__(self):
         options = [
             make_option('--all', action='store_true', default=False,
                         help='display the baselines for *all* tests'),
@@ skipping 40 matching lines @@
                     print "%s,%s,%s,%s,%s,%s" % (port_name, test_name, self._platform_for_path(test_name),
                                                  extension[1:], baseline_location, self._platform_for_path(baseline_location))
                 else:
                     print baseline_location
 
     def _platform_for_path(self, relpath):
         platform_matchobj = self._platform_regexp.match(relpath)
         if platform_matchobj:
             return platform_matchobj.group(1)
         return None