[webkitpy] Merge ChromiumBuildBot class into the BuildBot class.

Tools/Scripts/webkitpy/common/net/buildbot/buildbot_unittest.py

 # Copyright (C) 2009 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 79 matching lines @@
                 "sourceStamp": {
                     "revision": None,  # revision=None means a trunk build started from the force-build button on the builder page.
                     },
                 "number": int(build_number),
                 # Intentionally missing the 'results' key, meaning it's a "pass" build.
             }
             return build_dictionary
         buildbot._fetch_build_dictionary = mock_fetch_build_dictionary
         self.assertIsNotNone(builder._fetch_build(1))
 
+    def test_results_url(self):
+        builder = BuildBot().builder_with_name('WebKit Mac10.8 (dbg)')
+        self.assertEqual(builder.results_url(),
+                         'https://storage.googleapis.com/chromium-layout-test-archives/WebKit_Mac10_8__dbg_')
+
+    def test_accumulated_results_url(self):
+        builder = BuildBot().builder_with_name('WebKit Mac10.8 (dbg)')
+        self.assertEqual(builder.accumulated_results_url(),
+                         'https://storage.googleapis.com/chromium-layout-test-archives/WebKit_Mac10_8__dbg_/results/layout-test-results')
+
 
 class BuildBotTest(unittest.TestCase):
 
     _example_one_box_status = '''
     <table>
     <tr>
     <td class="box"><a href="builders/Windows%20Debug%20%28Tests%29">Windows Debug (Tests)</a></td>
       <td align="center" class="LastBuild box success"><a href="builders/Windows%20Debug%20%28Tests%29/builds/3693">47380</a><br />build<br />successful</td>
       <td align="center" class="Activity building">building<br />ETA in<br />~ 14 mins<br />at 13:40</td>
     <tr>
@@ skipping 62 matching lines @@
             self.assertEqual(builder.keys(), expected_parsing.keys())
 
             for key, expected_value in expected_parsing.items():
                 self.assertEqual(builder[key], expected_value, ("Builder %d parse failure for key: %s: Actual='%s' Expected='%s'" % (x, key, builder[key], expected_value)))
 
     def test_builder_with_name(self):
         buildbot = BuildBot()
 
         builder = buildbot.builder_with_name("Test Builder")
         self.assertEqual(builder.name(), "Test Builder")
-        self.assertEqual(builder.url(), "http://build.webkit.org/builders/Test%20Builder")
+        self.assertEqual(builder.url(), "http://build.chromium.org/p/chromium.webkit/builders/Test%20Builder")
         self.assertEqual(builder.url_encoded_name(), "Test%20Builder")
-        self.assertEqual(builder.results_url(), "http://build.webkit.org/results/Test%20Builder")
+        self.assertEqual(builder.results_url(), "https://storage.googleapis.com/chromium-layout-test-archives/Test_Builder")
 
         # Override _fetch_build_dictionary function to not touch the network.
         def mock_fetch_build_dictionary(self, build_number):
             build_dictionary = {
                 "sourceStamp": {
                     "revision" : 2 * build_number,
                     },
                 "number" : int(build_number),
                 "results" : build_number % 2, # 0 means pass
             }
             return build_dictionary
         buildbot._fetch_build_dictionary = mock_fetch_build_dictionary
 
         build = builder.build(10)
         self.assertEqual(build.builder(), builder)
-        self.assertEqual(build.url(), "http://build.webkit.org/builders/Test%20Builder/builds/10")
-        self.assertEqual(build.results_url(), "http://build.webkit.org/results/Test%20Builder/r20%20%2810%29")
+        self.assertEqual(build.url(), "http://build.chromium.org/p/chromium.webkit/builders/Test%20Builder/builds/10")
+        self.assertEqual(build.results_url(), "https://storage.googleapis.com/chromium-layout-test-archives/Test_Builder/r20%20%2810%29")
         self.assertEqual(build.revision(), 20)
         self.assertTrue(build.is_green())
 
         build = build.previous_build()
         self.assertEqual(build.builder(), builder)
-        self.assertEqual(build.url(), "http://build.webkit.org/builders/Test%20Builder/builds/9")
-        self.assertEqual(build.results_url(), "http://build.webkit.org/results/Test%20Builder/r18%20%289%29")
+        self.assertEqual(build.url(), "http://build.chromium.org/p/chromium.webkit/builders/Test%20Builder/builds/9")
+        self.assertEqual(build.results_url(), "https://storage.googleapis.com/chromium-layout-test-archives/Test_Builder/r18%20%289%29")
         self.assertEqual(build.revision(), 18)
         self.assertFalse(build.is_green())
 
         self.assertIsNone(builder.build(None))
 
     _example_directory_listing = '''
 <h1>Directory listing for /results/SnowLeopard Intel Leaks/</h1>
 
 <table>
         <tr class="alt">
@@ skipping 184 matching lines @@
         b._fetch_revision_to_build_map = self._fetch_revision_to_build_map
         self.assertEqual("correct build", b.latest_cached_build())
 
     def results_url(self):
         return "some-url"
 
     def test_results_zip_url(self):
         b = Build(None, 123, 123, False)
         b.results_url = self.results_url
         self.assertEqual("some-url.zip", b.results_zip_url())