Refactor stages 1, 2 and test_api overhaul.

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.InputPlaceholder):
@@ skipping 302 matching lines @@
       full_args.append('--perf-dashboard-id=%s' % perf_dashboard_id)
     if perf_id:
       full_args.append('--perf-id=%s' % perf_id)
     if perf_config:
       full_args.extend(['--perf-config', perf_config])
     # This replaces the step_name that used to be sent via factory_properties.
     if test_type:
       full_args.append('--test-type=%s' % test_type)
     step_name = name or t_name
     full_args.append('--step-name=%s' % step_name)
-    if chartjson_file:
+    if chartjson_file and not 'step_test_data' in kwargs:
       full_args.append('--chartjson-file')
       full_args.append(self.m.json.output())
       kwargs['step_test_data'] = lambda: self.m.json.test_api.output([])
     if test_launcher_summary_output:
       full_args.extend([
         '--test-launcher-summary-output',
         test_launcher_summary_output
       ])
     if flakiness_dash:
       full_args.extend([
@@ skipping 468 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'))