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

scripts/slave/recipe_modules/skia/xsan_flavor.py

Index: scripts/slave/recipe_modules/skia/xsan_flavor.py
diff --git a/scripts/slave/recipe_modules/skia/xsan_flavor.py b/scripts/slave/recipe_modules/skia/xsan_flavor.py
index 60d4e872a1e673461474b20af5968b6e4fe6c39e..8af115dca9a3b8c2368481f8fd960045a1f09939 100644
--- a/scripts/slave/recipe_modules/skia/xsan_flavor.py
+++ b/scripts/slave/recipe_modules/skia/xsan_flavor.py
@@ -27,14 +27,14 @@ class XSanFlavorUtils(default_flavor.DefaultFlavorUtils):
     }[self._skia_api.builder_cfg['extra_config']]
 
   def compile(self, target):
-    cmd = [self._skia_api.m.path['checkout'].join('tools', 'xsan_build'),
+    cmd = [self._skia_api.skia_dir.join('tools', 'xsan_build'),
            self._sanitizer, target]
     self._skia_api.run(self._skia_api.m.step, 'build %s' % target, cmd=cmd,
-                       cwd=self._skia_api.m.path['checkout'])
+                       cwd=self._skia_api.skia_dir)
 
   def step(self, name, cmd, env=None, **kwargs):
     """Wrapper for the Step API; runs a step as appropriate for this flavor."""
-    skia_dir = self._skia_api.m.path['checkout']
+    skia_dir = self._skia_api.skia_dir
     lsan_suppressions = skia_dir.join('tools', 'lsan.supp')
     tsan_suppressions = skia_dir.join('tools', 'tsan.supp')
     ubsan_suppressions = skia_dir.join('tools', 'ubsan.supp')