ensure_goma for goma canary

scripts/slave/recipe_modules/goma/api.py

Index: scripts/slave/recipe_modules/goma/api.py
diff --git a/scripts/slave/recipe_modules/goma/api.py b/scripts/slave/recipe_modules/goma/api.py
index 16347eac088ef36cbd59eeb8b9bde6c31b643cbe..2ee16f19272458b4291896bfe05a07774d9f71a9 100644
--- a/scripts/slave/recipe_modules/goma/api.py
+++ b/scripts/slave/recipe_modules/goma/api.py
@@ -9,6 +9,7 @@ class GomaApi(recipe_api.RecipeApi):
 
   def update_goma_canary(self):
     """Returns a step for updating goma canary."""
+    # deprecated? switch to use ensure_goma with canary=True.
     # for git checkout, should use @refs/heads/master to use head.
     head = 'refs/heads/master'
     # TODO(phajdan.jr): Remove path['build'] usage, http://crbug.com/437264 .
@@ -17,14 +18,17 @@ class GomaApi(recipe_api.RecipeApi):
                     '--revision', 'build/goma@%s' % head],
                    cwd=self.m.path['build'])
 
-  def ensure_goma(self, goma_dir):
+  def ensure_goma(self, goma_dir, canary=False):
     # TODO(iannucci): switch to CIPD (https://goto.google.com/toxxq).
-    self.m.python(
-      name='ensure_goma',
-      script=self.resource('ensure_goma.py'),
-      args=[
+    args=[
         '--target-dir', goma_dir,
         '--download-from-google-storage-path',
         self.m.depot_tools.download_from_google_storage_path
-      ],
+    ]
+    if canary:
+      args += ['--canary']
+    self.m.python(
+      name='ensure_goma',
+      script=self.resource('ensure_goma.py'),
+      args=args,
       infra_step=True)