Revert "build: roll infra_paths changes"

scripts/slave/recipe_modules/gsutil/api.py

 # Copyright 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.
 
 import re
 
 from recipe_engine import recipe_api
 
 class GSUtilApi(recipe_api.RecipeApi):
   def __call__(self, cmd, name=None, use_retry_wrapper=True, version=None,
@@ skipping 10 matching lines @@
     Arguments:
       cmd: list of (string) arguments to pass to gsutil.
            Include gsutil-level options first (see 'gsutil help options').
       name: the (string) name of the step to use.
             Defaults to the first non-flag token in the cmd.
     """
     if not name:
       name = (t for t in cmd if not t.startswith('-')).next()
     full_name = 'gsutil ' + name
 
-    gsutil_path = self.m.infra_paths['depot_tools'].join('gsutil.py')
+    gsutil_path = self.m.path['depot_tools'].join('gsutil.py')
     cmd_prefix = []
 
     if use_retry_wrapper:
       # We pass the real gsutil_path to the wrapper so it doesn't have to do
       # brittle path logic.
       cmd_prefix = ['--', gsutil_path]
       gsutil_path = self.resource('gsutil_wrapper.py')
 
     if version:
       cmd_prefix.extend(['--force-version', version])
@@ skipping 103 matching lines @@
     gsutil_download_path = self.package_repo_resource(
         'scripts', 'slave', 'gsutil_download.py')
     args = ['--poll',
             '--url', url,
             '--dst', destination,
             '--poll-interval', str(poll_interval),
             '--timeout', str(timeout)]
     return self.m.python(name,
                          gsutil_download_path,
                          args,
-                         cwd=self.m.infra_paths['slave_build'])
+                         cwd=self.m.path['slave_build'])
 
   def _generate_metadata_args(self, metadata):
     result = []
     if metadata:
       for k, v in sorted(metadata.iteritems(), key=lambda (k, _): k):
         field = self._get_metadata_field(k)
         param = (field) if v is None else ('%s:%s' % (field, v))
         result += ['-h', param]
     return result
 
@@ skipping 36 matching lines @@
         'Content-Language',
         'Content-MD5',
         'Content-Type',
     ):
       return name
 
     # Add provider prefix
     if not provider_prefix:
       provider_prefix = 'x-goog-meta'
     return '%s-%s' % (provider_prefix, name)