Revert "build: roll infra_paths changes"

scripts/slave/recipe_modules/amp/api.py

 # Copyright 2015 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 contextlib
 import json
 
 from recipe_engine import recipe_api
 from recipe_engine import util as recipe_util
 
@@ skipping 25 matching lines @@
     return self._get_results_dir(test_run_id).join('results.zip')
 
   def _get_results_unzipped_path(self, test_run_id):
     return self._get_results_dir(test_run_id).join('unzipped_results')
 
   def _get_results_logcat_path(self, test_run_id):
     return self._get_results_unzipped_path(test_run_id).join(
         'appurify_results', 'logcat.txt')
 
   def _get_api_key_file(self):
-    # TODO(phajdan.jr): Remove infra_paths['build'] usage, http://crbug.com/437264 .
-    local_api_key_file = self.m.infra_paths['build'].join(
+    # TODO(phajdan.jr): Remove path['build'] usage, http://crbug.com/437264 .
+    local_api_key_file = self.m.path['build'].join(
         'site_config', '.amp_%s_key' % self.c.pool)
     return local_api_key_file
 
   def _get_api_secret_file(self):
-    # TODO(phajdan.jr): Remove infra_paths['build'] usage, http://crbug.com/437264 .
-    local_api_secret_file = self.m.infra_paths['build'].join(
+    # TODO(phajdan.jr): Remove path['build'] usage, http://crbug.com/437264 .
+    local_api_secret_file = self.m.path['build'].join(
         'site_config', '.amp_%s_secret' % self.c.pool)
     return local_api_secret_file
 
   def _ensure_keys_downloaded(self):
     local_api_key_file = self._get_api_key_file() 
     if not self.m.path.exists(local_api_key_file):
       self.m.gsutil.download_url(name='download amp api key',
                                  url=self.c.api_key_file_url,
                                  dest=local_api_key_file)
       self.m.path.mock_add_paths(local_api_key_file)
@@ skipping 264 matching lines @@
       amp_args += ['--remote-device-timeout', device_timeout]
 
     if network_config:
       amp_args += ['--network-config', network_config]
 
     if test_run_timeout:
       amp_args += ['--test-timeout', test_run_timeout]
 
     return amp_args