Revert of Refactor the buildbot module in webkitpy.

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

Index: third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline.py b/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline.py
index 852f22fead9ca24f23c101ef1428bf5deff0bcaa..927c82bbbd2cd4f8e11771b59555705412c30759 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline.py
@@ -96,6 +96,13 @@
         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)
 
@@ -245,7 +252,7 @@
         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)
@@ -316,7 +323,8 @@
         """
         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:
@@ -685,8 +693,12 @@
         ])
 
     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:
@@ -696,7 +708,7 @@
         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()
 
@@ -707,7 +719,7 @@
             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: