Refactor stages 1, 2 and test_api overhaul.

scripts/slave/recipe_modules/chromium/api.py

Index: scripts/slave/recipe_modules/chromium/api.py
diff --git a/scripts/slave/recipe_modules/chromium/api.py b/scripts/slave/recipe_modules/chromium/api.py
index fe534cafe188c94860b11801f553a22b5f828e8a..7db6178dadd73910ed94006ce3240ae6a497c202 100644
--- a/scripts/slave/recipe_modules/chromium/api.py
+++ b/scripts/slave/recipe_modules/chromium/api.py
@@ -312,7 +312,7 @@ class ChromiumApi(recipe_api.RecipeApi):
       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([])