[recipes] Stop pretending that buildbot_spec is a step, simplify

infra/bots/recipe_modules/vars/api.py

 # Copyright 2016 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.
 
 
 # pylint: disable=W0201
 
 
 from recipe_engine import recipe_api
 import os
@@ skipping 765 matching lines @@
          'SAN' in self.builder_name) or
         'RecreateSKPs' in self.builder_name):
       self.need_chromium_checkout = True
       if 'RecreateSKPs' in self.builder_name:
         self.gclient_env['CPPFLAGS'] = (
             '-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1')
 
     # Some bots also require a checkout of PDFium.
     self.need_pdfium_checkout = 'PDFium' in self.builder_name
 
-
-  def update_with_builder_spec(self, builder_spec):
-    """Set more variables based on the builder_spec."""
-    # Obtain the spec for this builder from the Skia repo. Use it to set more
-    # properties.
-    self.builder_spec = builder_spec
+    # Obtain the spec for this builder. Use it to set more properties.
+    self.builder_spec = get_builder_spec(self.m, self.builder_name)
 
     self.builder_cfg = self.builder_spec['builder_cfg']
     self.role = self.builder_cfg['role']
 
     self.configuration = self.builder_spec['configuration']
     self.default_env.update({'SKIA_OUT': self.skia_out,
                              'BUILDTYPE': self.configuration})
     self.default_env.update(self.builder_spec['env'])
     self.build_targets = [str(t) for t in self.builder_spec['build_targets']]
     self.do_compile_steps = self.builder_spec.get('do_compile_steps', True)
     self.do_test_steps = self.builder_spec['do_test_steps']
     self.do_perf_steps = self.builder_spec['do_perf_steps']
     self.is_trybot = self.builder_cfg['is_trybot']
     self.issue = None
     self.patchset = None
     self.rietveld = None
     if self.is_trybot:
       self.issue = self.m.properties['issue']
       self.patchset = self.m.properties['patchset']
       self.rietveld = self.m.properties['rietveld']
     self.upload_dm_results = self.builder_spec['upload_dm_results']
     self.upload_perf_results = self.builder_spec['upload_perf_results']
     self.dm_dir = self.m.path.join(
         self.swarming_out_dir, 'dm')
     self.perf_data_dir = self.m.path.join(self.swarming_out_dir,
         'perfdata', self.builder_name, 'data')
     self.dm_flags = self.builder_spec['dm_flags']
     self.nanobench_flags = self.builder_spec['nanobench_flags']