Use gsutil.py for download_from_google_storage instead of the builtin one

upload_to_google_storage.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Uploads files to Google Storage content addressed."""
 
 import hashlib
 import optparse
 import os
 import Queue
 import re
 import stat
 import sys
 import threading
 import time
 
 from download_from_google_storage import check_bucket_permissions
 from download_from_google_storage import get_sha1
 from download_from_google_storage import Gsutil
 from download_from_google_storage import printer_worker
-
-GSUTIL_DEFAULT_PATH = os.path.join(
-    os.path.dirname(os.path.abspath(__file__)),
-    'third_party', 'gsutil', 'gsutil')
+from download_from_google_storage import GSUTIL_DEFAULT_PATH
 
 USAGE_STRING = """%prog [options] target [target2 ...].
 Target is the file intended to be uploaded to Google Storage.
 If target is "-", then a list of files will be taken from standard input
 
 This script will generate a file (original filename).sha1 containing the
 sha1 sum of the uploaded file.
 It is recommended that the .sha1 file is checked into the repository,
 the original file removed from the repository, and a hook added to the
 DEPS file to call download_from_google_storage.py.
@@ skipping 53 matching lines @@
             local_md5 = get_md5_cached(filename)
           else:
             local_md5 = get_md5(filename)
         if local_md5 == remote_md5:
           stdout_queue.put(
               '%d> File %s already exists and MD5 matches, upload skipped' %
               (thread_num, filename))
           continue
     stdout_queue.put('%d> Uploading %s...' % (
         thread_num, filename))
-    code, _, err = gsutil.check_call('cp', '-q', filename, file_url)
+    code, _, err = gsutil.check_call('cp', filename, file_url)
     if code != 0:
       ret_codes.put(
           (code,
            'Encountered error on uploading %s to %s\n%s' %
            (filename, file_url, err)))
       continue
 
     # Mark executable files with the header "x-goog-meta-executable: 1" which
     # the download script will check for to preserve the executable bit.
     if not sys.platform.startswith('win'):
@@ skipping 117 matching lines @@
                     help='Use \\0 instead of \\n when parsing '
                     'the file list from stdin.  This is useful if the input '
                     'is coming from "find ... -print0".')
   (options, args) = parser.parse_args()
 
   # Enumerate our inputs.
   input_filenames = get_targets(args, parser, options.use_null_terminator)
 
   # Make sure we can find a working instance of gsutil.
   if os.path.exists(GSUTIL_DEFAULT_PATH):
-    gsutil = Gsutil(GSUTIL_DEFAULT_PATH, boto_path=options.boto,
-                    bypass_prodaccess=True)
+    gsutil = Gsutil(GSUTIL_DEFAULT_PATH, boto_path=options.boto)
   else:
     gsutil = None
     for path in os.environ["PATH"].split(os.pathsep):
       if os.path.exists(path) and 'gsutil' in os.listdir(path):
         gsutil = Gsutil(os.path.join(path, 'gsutil'), boto_path=options.boto)
     if not gsutil:
       parser.error('gsutil not found in %s, bad depot_tools checkout?' %
                    GSUTIL_DEFAULT_PATH)
 
   base_url = 'gs://%s' % options.bucket
 
   # Check we have a valid bucket with valid permissions.
   code = check_bucket_permissions(base_url, gsutil)
   if code:
     return code
 
   return upload_to_google_storage(
       input_filenames, base_url, gsutil, options.force, options.use_md5,
       options.num_threads, options.skip_hashing)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))