Update prebuilt.py to handle private google storage uploads.

buildbot/prebuilt_unittest.py

Index: buildbot/prebuilt_unittest.py
diff --git a/buildbot/prebuilt_unittest.py b/buildbot/prebuilt_unittest.py
index 6c7a650d9a2923fc63fa8d38f93bab49bad5d54b..a4f2588e6a4902e8666d5bb5b6469a488d83663e 100755
--- a/buildbot/prebuilt_unittest.py
+++ b/buildbot/prebuilt_unittest.py
@@ -504,6 +504,7 @@ class TestMain(unittest.TestCase):
     options.filters = True
     options.key = 'PORTAGE_BINHOST'
     options.sync_binhost_conf = True
+    options.acl_file = None
     self.mox.StubOutWithMock(prebuilt, 'ParseOptions')
     prebuilt.ParseOptions().AndReturn(options)
     self.mox.StubOutWithMock(prebuilt, 'LoadPrivateFilters')
@@ -512,7 +513,7 @@ class TestMain(unittest.TestCase):
     prebuilt.GrabRemotePackageIndex(old_binhost).AndReturn(True)
     self.mox.StubOutWithMock(prebuilt.PrebuiltUploader, '__init__')
     prebuilt.PrebuiltUploader.__init__(options.upload, 'private',
-        options.binhost_base_url, mox.IgnoreArg())
+        options.upload, mox.IgnoreArg())
     self.mox.StubOutWithMock(prebuilt.PrebuiltUploader, '_SyncHostPrebuilts')
     prebuilt.PrebuiltUploader._SyncHostPrebuilts(options.build_path,
         mox.IgnoreArg(), options.key, options.git_sync,