Reland "Skia: Maintain a checkout on swarming (compile) bots"

scripts/slave/recipe_modules/skia/default_flavor.py

 # Copyright 2014 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.
 
 
 """Default flavor utils class, used for desktop builders."""
 
 
 import json
 
@@ skipping 65 matching lines @@
         not 'TSAN' in self._skia_api.builder_name):
       new_cmd = ['catchsegv', path_to_app]
     else:
       new_cmd = [path_to_app]
     new_cmd.extend(cmd[1:])
     return self._skia_api.run(self._skia_api.m.step,
                               name, cmd=new_cmd, **kwargs)
 
   def maybe_download_win_toolchain(self):
     """Download the Win toolchain if necessary."""
-    toolchain_hash_file = self._skia_api.skia_dir.join(
-        'infra', 'bots', 'win_toolchain_hash.json')
+    toolchain_hash_file = self._skia_api.infrabots_dir.join(
+        'win_toolchain_hash.json')
     if (self._skia_api.m.path.exists(toolchain_hash_file) and
         self._skia_api.builder_cfg.get('extra_config') == 'VS2015'):
       # Find the desired toolchain version.
       test_data = '''{
     "2013": "705384d88f80da637eb367e5acc6f315c0e1db2f",
     "2015": "38380d77eec9164e5818ae45e2915a6f22d60e85"
 }'''
       j = self._skia_api._readfile(toolchain_hash_file,
                                    name='Read win_toolchain_hash.json',
                                    test_data=test_data).rstrip()
@@ skipping 50 matching lines @@
             args=['--win_toolchain_json', win_toolchain_json,
                   '--depot_tools_parent_dir', toolchain_dir])
         self._skia_api._writefile(actual_hash_file, desired_hash)
       return toolchain_src_dir
 
   @property
   def chrome_path(self):
     """Path to a checkout of Chrome on this machine."""
     if self._chrome_path is None:
       if self._skia_api.running_in_swarming:
-        self._chrome_path = self._skia_api.slave_dir.join('src')
+        self._chrome_path = self._skia_api.checkout_root.join('src')
         return self._chrome_path
 
       if self._skia_api.m.platform.is_win:
         chrome_path = self.maybe_download_win_toolchain()
         if chrome_path:
           self._chrome_path = chrome_path
           return self._chrome_path
 
     if self._chrome_path is None:
       self._chrome_path = self._skia_api.m.path.join(
@@ skipping 115 matching lines @@
     return DeviceDirs(
         dm_dir=self._skia_api.dm_dir,
         perf_data_dir=self._skia_api.perf_data_dir,
         resource_dir=self._skia_api.resource_dir,
         images_dir=join('images'),
         skp_dir=self._skia_api.local_skp_dir,
         tmp_dir=join('tmp'))
 
   def __repr__(self):
     return '<%s object>' % self.__class__.__name__  # pragma: no cover