Remove separate SP enabled SKP run since it is now on by default

tools/skp/recreate_skps.py

 #!/usr/bin/env python
 # Copyright (c) 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.
 
 
 """Run the webpages_playback automation script."""
 
 
 import os
@@ skipping 46 matching lines @@
     '--page_sets', 'all',
     '--browser_executable', browser_executable,
     '--non-interactive',
     '--upload',
     '--alternate_upload_dir', upload_dir,
     '--chrome_src_path', chrome_src_path,
   ]
 
   try:
     shell_utils.run(webpages_playback_cmd)
-
-    # Temporary change to enable Slimming Paint runs. See skia:3763.
-    skia_page_sets_path = os.path.join(
-        os.path.dirname(os.path.realpath(__file__)), 'page_sets')
-    sp_skia_page_sets = [
-        os.path.join(skia_page_sets_path, 'skia_carsvg_desktop.py'),
-        os.path.join(skia_page_sets_path, 'skia_chalkboard_desktop.py'),
-        os.path.join(skia_page_sets_path, 'skia_css3gradients_desktop.py'),
-        os.path.join(skia_page_sets_path, 'skia_espn_desktop.py'),
-        os.path.join(skia_page_sets_path, 'skia_gmailthread_desktop.py'),
-        os.path.join(skia_page_sets_path, 'skia_googlehome_desktop.py'),
-        os.path.join(skia_page_sets_path, 'skia_googlespreadsheet_desktop.py'),
-        os.path.join(skia_page_sets_path, 'skia_jsfiddlebigcar_desktop.py'),
-        os.path.join(skia_page_sets_path, 'skia_mapsvg_desktop.py'),
-        os.path.join(skia_page_sets_path, 'skia_nytimes_desktop.py'),
-        os.path.join(skia_page_sets_path, 'skia_samoasvg_desktop.py'),
-        os.path.join(skia_page_sets_path, 'skia_tigersvg_desktop.py'),
-        os.path.join(skia_page_sets_path, 'skia_ugamsolutions_desktop.py'),
-        os.path.join(skia_page_sets_path, 'skia_digg_nexus10.py'),
-        os.path.join(skia_page_sets_path, 'skia_gmail_nexus10.py'),
-        os.path.join(skia_page_sets_path, 'skia_pravda_nexus10.py'),
-    ]
-    webpages_playback_cmd.extend([
-        '--skp_prefix', 'sp_',
-        '--browser_extra_args', '--enable-slimming-paint',
-        '--page_sets', '%s' % ','.join(sp_skia_page_sets),
-    ])
-    shell_utils.run(webpages_playback_cmd)
   finally:
     # Clean up any leftover browser instances. This can happen if there are
     # telemetry crashes, processes are not always cleaned up appropriately by
     # the webpagereplay and telemetry frameworks.
     procs = subprocess.check_output(['ps', 'ax'])
     for line in procs.splitlines():
       if browser_executable in line:
         pid = line.strip().split(' ')[0]
         if pid != str(os.getpid()) and not 'python' in line:
           try:
             shell_utils.run(['kill', '-9', pid])
           except shell_utils.CommandFailedException as e:
             print e
         else:
           print 'Refusing to kill self.'
 
   print 'writing %s: %s' % (SKP_VERSION_FILE, skp_version)
   with open(SKP_VERSION_FILE, 'w') as f:
     f.write(str(skp_version))
 
 
 if '__main__' == __name__:
   if len(sys.argv) != 3:
     print >> sys.stderr, 'USAGE: %s <chrome src path> <browser executable>'
     sys.exit(1)
   main(*sys.argv[1:])