Fix Chrome build for RecreateSKPs and CommandBuffer bots for GYP->GN

infra/bots/recipes/swarm_RecreateSKPs.py

 # Copyright 2014 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.
 
 
 """Recipe for the Skia RecreateSKPs Bot."""
 
 
 DEPS = [
   'build/file',
@@ skipping 74 matching lines @@
 if os.path.isfile(backup_file):
   os.rename(backup_file, token_file)
         """ % (DEPOT_TOOLS_AUTH_TOKEN_FILE,
                DEPOT_TOOLS_AUTH_TOKEN_FILE_BACKUP),
     )
 
 
 def RunSteps(api):
   # Check out Chrome.
   api.skia.setup()
-  api.gclient.runhooks(
-      env={'CPPFLAGS': '-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1'})
 
   src_dir = api.skia.checkout_root.join('src')
+  out_dir = src_dir.join('out', 'Release')
 
-  # Call build/gyp_chromium
-  api.step('gyp_chromium',
-           ['build/gyp_chromium'],
+  # Call GN.
+  platform = 'linux64'  # This bot only runs on linux; don't bother checking.
+  gn = src_dir.join('buildtools', platform, 'gn')
+  api.step('GN',
+           [gn, 'gen', out_dir],
            env={'CPPFLAGS': '-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1',
                 'GYP_GENERATORS': 'ninja'},
            cwd=src_dir)
   # Build Chrome.
   api.step('Build Chrome',
-           ['ninja', '-C', 'out/Release', 'chrome'],
+           ['ninja', '-C', out_dir, 'chrome'],
            cwd=src_dir)
 
   # Download boto file (needed by recreate_skps.py) to tmp dir.
   boto_file = api.path['slave_build'].join('tmp', '.boto')
   api.python.inline(
       'download boto file',
       """
 import os
 import urllib2
 
@@ skipping 63 matching lines @@
             api.properties(buildername=builder,
                            mastername=mastername,
                            slavename=slavename,
                            revision='abc123',
                            buildnumber=2,
                            path_config='kitchen',
                            swarm_out_dir='[SWARM_OUT_DIR]') +
             api.path.exists(api.path['slave_build'].join('skp_output'))
         )
         yield test