Update prebuilt.py to handle private google storage uploads.

buildbot/prebuilt_unittest.py

 #!/usr/bin/python
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import copy
 import mox
 import os
 import shutil
 import sys
@@ skipping 486 matching lines @@
     options.build_path = '/trunk'
     options.private = True
     options.sync_host = True
     options.git_sync = True
     options.upload = 'gs://upload/'
     options.binhost_base_url = options.upload
     options.prepend_version = True
     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')
     prebuilt.LoadPrivateFilters(options.build_path)
     self.mox.StubOutWithMock(prebuilt, 'GrabRemotePackageIndex')
     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,
         options.sync_binhost_conf)
     self.mox.StubOutWithMock(prebuilt.PrebuiltUploader, '_SyncBoardPrebuilts')
     prebuilt.PrebuiltUploader._SyncBoardPrebuilts(options.board,
         options.build_path, mox.IgnoreArg(), options.key, options.git_sync,
         options.sync_binhost_conf)
     self.mox.ReplayAll()
     prebuilt.main()
 
 if __name__ == '__main__':
   unittest.main()