ensure_goma for goma canary

scripts/slave/recipe_modules/chromium/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 re
 
 from recipe_engine import recipe_api
 from recipe_engine import util as recipe_util
 
 class TestLauncherFilterFileInputPlaceholder(recipe_util.Placeholder):
@@ skipping 456 matching lines @@
     # Other platforms continue to use DEPS-ed goma.
     if not self.m.platform.is_linux:
       return
 
     # TODO(phajdan.jr): Move goma out of src checkout.
     goma_dir = self.m.path['checkout'].join('build', 'goma', 'client')
 
     self.c.gyp_env.GYP_DEFINES['gomadir'] = goma_dir
     self.c.compile_py.goma_dir = goma_dir
 
-    self.m.goma.ensure_goma(goma_dir)
+    self.m.goma.ensure_goma(goma_dir, canary=self.c.compile_py.goma_canary)
 
   def runhooks(self, **kwargs):
     """Run the build-configuration hooks for chromium."""
     env = self.get_env()
     env.update(kwargs.get('env', {}))
 
     # CrOS "chrome_sdk" builds fully override GYP_DEFINES in the wrapper. Zero
     # it to not show confusing information in the build logs.
     if not self.c.TARGET_CROS_BOARD:
       # TODO(sbc): Ideally we would not need gyp_env set during runhooks when
@@ skipping 227 matching lines @@
       }))
 
   def get_annotate_by_test_name(self, test_name):
     return 'graphing'
 
   def download_lto_plugin(self):
     return self.m.python(
         name='download LTO plugin',
         script=self.m.path['checkout'].join(
             'build', 'download_gold_plugin.py'))