Revert of ensure_goma for goma canary

scripts/slave/recipe_modules/chromium/config.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 pipes
 
 from recipe_engine.config import config_item_context, ConfigGroup
 from recipe_engine.config import Dict, List, Single, Static, Set, BadConf
 from recipe_engine.config_types import Path
 
@@ skipping 22 matching lines @@
   equal_fn = lambda tup: ('%s=%s' % (tup[0], pipes.quote(str(tup[1]))))
   return ConfigGroup(
     compile_py = ConfigGroup(
       default_targets = Set(basestring),
       build_args = Single(basestring, required=False),
       build_tool = Single(basestring, required=False),
       cross_tool = Single(basestring, required=False),
       compiler = Single(basestring, required=False),
       mode = Single(basestring, required=False),
       goma_dir = Single(Path, required=False),
-      goma_canary = Single(bool, empty_val=False, required=False),
       goma_hermetic = Single(basestring, required=False),
       goma_enable_remote_link = Single(bool, empty_val=False, required=False),
       goma_store_local_run_output = Single(bool, empty_val=False, required=False),
       goma_enable_compiler_info_cache = Single(
           bool, empty_val=False, required=False),
       clobber = Single(bool, empty_val=False, required=False, hidden=False),
       pass_arch_flag = Single(bool, empty_val=False, required=False),
       xcode_sdk = Single(basestring, required=False),
       xcode_project = Single(Path, required=False),
       solution = Single(Path, required=False),
@@ skipping 191 matching lines @@
 @config_ctx()
 def msvs2013(c):
   c.gyp_env.GYP_MSVS_VERSION = '2013'
 
 @config_ctx()
 def msvs2015(c):
   c.gyp_env.GYP_MSVS_VERSION = '2015'
 
 @config_ctx()
 def goma_canary(c):
-  c.compile_py.goma_canary = True
   c.compile_py.goma_hermetic = 'error'
   c.compile_py.goma_enable_compiler_info_cache = True
 
 @config_ctx()
 def goma_staging(c):
   c.env.GOMA_STUBBY_PROXY_IP_ADDRESS = 'sandbox.google.com'
 
 @config_ctx()
 def goma_hermetic_fallback(c):
   c.compile_py.goma_hermetic = 'fallback'
@@ skipping 536 matching lines @@
 def cast_linux(c):
   c.gyp_env.GYP_DEFINES['chromecast'] = 1
 
 @config_ctx()
 def internal_gles2_conform_tests(c):
   c.gyp_env.GYP_DEFINES['internal_gles2_conform_tests'] = 1
 
 @config_ctx()
 def build_angle_deqp_tests(c):
   c.gyp_env.GYP_DEFINES['build_angle_deqp_tests'] = 1