add ACL-setting code to upload_rendered_skps.py

slave/skia_slave_scripts/upload_skimage_results.py

 #!/usr/bin/env python
 # Copyright (c) 2013 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.
 
 """Upload results from running skimage."""
 
 import build_step
 import os
 import posixpath
 # Must be imported after build_step, which adds site_config to the python path.
 import skia_vars
 import sys
 
-from utils import old_gs_utils as gs_utils
+from utils import gs_utils
+from utils import old_gs_utils
 from utils import sync_bucket_subdir
-from build_step import PLAYBACK_CANNED_ACL
 from build_step import BuildStep
 
 SKP_TIMEOUT_MULTIPLIER = 8
 
 class UploadSKImageResults(BuildStep):
 
   def __init__(
       self,
       timeout=build_step.DEFAULT_TIMEOUT * SKP_TIMEOUT_MULTIPLIER,
       no_output_timeout=(
@@ skipping 16 matching lines @@
 
   def _Run(self):
     # Copy actual-results.json to skimage/actuals
     print '\n\n====Uploading skimage actual-results to Google Storage====\n\n'
     src_dir = os.path.abspath(os.path.join(self._skimage_out_dir,
                                            self._builder_name))
     dest_dir = posixpath.join(
         skia_vars.GetGlobalVariable('googlestorage_bucket'),
         'skimage', 'actuals', self._builder_name)
     http_header_lines = ['Cache-Control:public,max-age=3600']
-    gs_utils.upload_dir_contents(local_src_dir=src_dir,
-                                 remote_dest_dir=dest_dir,
-                                 gs_acl='public-read',
-                                 http_header_lines=http_header_lines)
+    old_gs_utils.upload_dir_contents(local_src_dir=src_dir,
+                                     remote_dest_dir=dest_dir,
+                                     gs_acl='public-read',
+                                     http_header_lines=http_header_lines)
 
     # Copy actual images to Google Storage at skimage/output. This will merge
     # with the existing files.
     print '\n\n========Uploading skimage results to Google Storage=======\n\n'
     src_dir = os.path.abspath(os.path.join(self._skimage_out_dir, 'images'))
     dest_dir = posixpath.join(
         skia_vars.GetGlobalVariable('googlestorage_bucket'),
         'skimage', 'output', 'images')
     if os.path.isdir(src_dir) and os.listdir(src_dir):
-      gs_utils.upload_dir_contents(local_src_dir=src_dir,
-                                   remote_dest_dir=dest_dir,
-                                   gs_acl=PLAYBACK_CANNED_ACL)
+      old_gs_utils.upload_dir_contents(
+          local_src_dir=src_dir, remote_dest_dir=dest_dir,
+          gs_acl=gs_utils.GSUtils.PLAYBACK_CANNED_ACL)
 
 if '__main__' == __name__:
   sys.exit(BuildStep.RunBuildStep(UploadSKImageResults))