Revert of depot_tools: add infra_paths recipe module for infra-specific paths

recipe_modules/rietveld/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 urlparse
 
 from recipe_engine import recipe_api
 
 
 class RietveldApi(recipe_api.RecipeApi):
@@ skipping 49 matching lines @@
         or 'oauth2'. See also apply_issue.py --help (-E and --no-auth options.)
     """
     # TODO(pgervais): replace *root_pieces by a single Path object.
     authentication = kwargs.get('authentication', None)
     rietveld_url = self.m.properties['rietveld']
     issue_number = self.m.properties['issue']
 
     if authentication == 'oauth2':
       step_result = self.m.python(
         'apply_issue',
-        self.m.infra_paths['depot_tools'].join('apply_issue.py'), [
+        self.m.path['depot_tools'].join('apply_issue.py'), [
           '-r', self.m.path['checkout'].join(*root_pieces),
           '-i', issue_number,
           '-p', self.m.properties['patchset'],
           '-s', rietveld_url,
-          '-E', self.m.infra_paths['build'].join(
-              'site_config', '.rietveld_client_email'),
-          '-k', self.m.infra_paths['build'].join(
-              'site_config', '.rietveld_secret_key')
+          '-E', self.m.path['build'].join('site_config',
+                                          '.rietveld_client_email'),
+          '-k', self.m.path['build'].join('site_config',
+                                          '.rietveld_secret_key')
           ],
         )
 
     else:
       step_result = self.m.python(
         'apply_issue',
-        self.m.infra_paths['depot_tools'].join('apply_issue.py'), [
+        self.m.path['depot_tools'].join('apply_issue.py'), [
           '-r', self.m.path['checkout'].join(*root_pieces),
           '-i', issue_number,
           '-p', self.m.properties['patchset'],
           '-s', rietveld_url,
           '--no-auth'],
         )
     step_result.presentation.links['Applied issue %s' % issue_number] = (
       urlparse.urljoin(rietveld_url, str(issue_number)))