Revert of Refactor the buildbot module in webkitpy.

third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline.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 78 matching lines @@
     results_directory_option = optparse.make_option("--results-directory", help="Local results directory to use.")
 
     suffixes_option = optparse.make_option("--suffixes", default=','.join(BASELINE_SUFFIX_LIST), action="store",
                                            help="Comma-separated-list of file types to rebaseline.")
 
     def __init__(self, options=None):
         super(AbstractRebaseliningCommand, self).__init__(options=options)
         self._baseline_suffix_list = BASELINE_SUFFIX_LIST
         self._scm_changes = {'add': [], 'delete': [], 'remove-lines': []}
 
+    def _results_url(self, builder_name, build_number=None):
+        builder = self._tool.buildbot.builder_with_name(builder_name)
+        if build_number:
+            build = builder.build(build_number)
+            return build.results_url()
+        return builder.latest_layout_test_results_url()
+
     def _add_to_scm_later(self, path):
         self._scm_changes['add'].append(path)
 
     def _delete_from_scm_later(self, path):
         self._scm_changes['delete'].append(path)
 
     def _print_scm_changes(self):
         print(json.dumps(self._scm_changes))
 
 
@@ skipping 129 matching lines @@
         port = self._tool.port_factory.get_from_builder_name(options.builder)
         if port.reference_files(options.test):
             if 'png' in self._baseline_suffix_list:
                 _log.warning("Cannot rebaseline image result for reftest: %s", options.test)
                 return
             assert self._baseline_suffix_list == ['txt']
 
         if options.results_directory:
             results_url = 'file://' + options.results_directory
         else:
-            results_url = self._tool.buildbot.results_url(options.builder, build_number=options.build_number)
+            results_url = self._results_url(options.builder, build_number=options.build_number)
 
         for suffix in self._baseline_suffix_list:
             self._rebaseline_test(options.builder, options.test, suffix, results_url)
         self._scm_changes['remove-lines'].append({'builder': options.builder, 'test': options.test})
 
     def execute(self, options, args, tool):
         self._rebaseline_test_and_update_expectations(options)
         self._print_scm_changes()
 
 
@@ skipping 50 matching lines @@
     @memoized
     def build_data(self):
         """Returns a map of Build objects to LayoutTestResult objects.
 
         The Build objects are the latest builds for the release builders,
         and LayoutTestResult objects for results fetched from archived layout
         test results.
         """
         build_to_results = {}
         for builder_name in self._release_builders():
-            builder_results = self._tool.buildbot.accumulated_results_url_base(builder_name)
+            builder = self._tool.buildbot.builder_with_name(builder_name)
+            builder_results = builder.latest_layout_test_results()
             if builder_results:
                 build_to_results[Build(builder_name)] = builder_results
             else:
                 raise Exception("No result for builder %s." % builder_name)
         return build_to_results
 
     # The release builders cycle much faster than the debug ones and cover all the platforms.
     def _release_builders(self):
         release_builders = []
         for builder_name in self._tool.builders.all_continuous_builder_names():
@@ skipping 348 matching lines @@
         super(Rebaseline, self).__init__(options=[
             self.no_optimize_option,
             # FIXME: should we support the platform options in addition to (or instead of) --builders?
             self.suffixes_option,
             self.results_directory_option,
             optparse.make_option("--builders", default=None, action="append",
                                  help="Comma-separated-list of builders to pull new baselines from (can also be provided multiple times)."),
         ])
 
     def _builders_to_pull_from(self):
-        return self._tool.user.prompt_with_list(
+        chosen_names = self._tool.user.prompt_with_list(
             "Which builder to pull results from:", self._release_builders(), can_choose_multiple=True)
+        return [self._builder_with_name(name) for name in chosen_names]
+
+    def _builder_with_name(self, name):
+        return self._tool.buildbot.builder_with_name(name)
 
     def execute(self, options, args, tool):
         if not args:
             _log.error("Must list tests to rebaseline.")
             return
 
         if options.builders:
             builders_to_check = []
             for builder_names in options.builders:
-                builders_to_check += builder_names.split(",")
+                builders_to_check += [self._builder_with_name(name) for name in builder_names.split(",")]
         else:
             builders_to_check = self._builders_to_pull_from()
 
         test_prefix_list = {}
         suffixes_to_update = options.suffixes.split(",")
 
         for builder in builders_to_check:
             for test in args:
                 if test not in test_prefix_list:
                     test_prefix_list[test] = {}
-                build = Build(builder)
+                build = Build(builder.name())
                 test_prefix_list[test][build] = suffixes_to_update
 
         if options.verbose:
             _log.debug("rebaseline-json: " + str(test_prefix_list))
 
         self._rebaseline(options, test_prefix_list)
 
 
 class AutoRebaseline(AbstractParallelRebaselineCommand):
     name = "auto-rebaseline"
@@ skipping 254 matching lines @@
                     issue_already_closed = tool.executive.run_command(
                         ['git', 'config', 'branch.%s.rietveldissue' % rebaseline_branch_name],
                         return_exit_code=True)
                     if not issue_already_closed:
                         self._run_git_cl_command(options, ['set_close'])
 
                 tool.scm().ensure_cleanly_tracking_remote_master()
                 if old_branch_name_or_ref:
                     tool.scm().checkout_branch(old_branch_name_or_ref)
                 tool.scm().delete_branch(rebaseline_branch_name)