Refactor stages 1, 2 and test_api overhaul.

scripts/slave/recipes/bisection/android_bisect.expected/basic_recipe_android_s5_perf_cq.json

Index: scripts/slave/recipes/bisection/android_bisect.expected/basic_recipe_android_s5_perf_cq.json
diff --git a/scripts/slave/recipes/bisection/android_bisect.expected/basic_recipe_android_s5_perf_cq.json b/scripts/slave/recipes/bisection/android_bisect.expected/basic_recipe_android_s5_perf_cq.json
index b01a2411c965afd1f65be8c3a92de206503a7e9d..a78ecc0fe9509a43e64af736ba494b85e2c3d59a 100644
--- a/scripts/slave/recipes/bisection/android_bisect.expected/basic_recipe_android_s5_perf_cq.json
+++ b/scripts/slave/recipes/bisection/android_bisect.expected/basic_recipe_android_s5_perf_cq.json
@@ -425,35 +425,6 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[build::bisect_tester]/resources/put_temp.py"
-    ],
-    "cwd": "[BUILDER_CACHE]/android_s5_perf_cq",
-    "name": "saving url to temp file",
-    "stdin": "http://build.chromium.org/p/tryserver.chromium.perf/json/builders/android_s5_perf_cq/builds/571",
-    "stdout": "/path/to/tmp/"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
-      "--",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "/tmp/dummy1",
-      "gs://chrome-perf/bisect-results/f7a7b4135624439cbd27fdd5133d74ec"
-    ],
-    "cwd": "[BUILDER_CACHE]/android_s5_perf_cq",
-    "name": "gsutil bisect-results/f7a7b4135624439cbd27fdd5133d74ec",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chrome-perf/bisect-results/f7a7b4135624439cbd27fdd5133d74ec@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
       "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n  chromium_utils.RemoveDirectory(sys.argv[1])\n",
       "[BUILDER_CACHE]/android_s5_perf_cq/src/out/Release"
     ],
@@ -601,41 +572,6 @@
     "cmd": [
       "python",
       "-u",
-      "RECIPE_MODULE[build::bisect_tester]/resources/put_temp.py"
-    ],
-    "env": {
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_s5_perf_cq/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_s5_perf_cq/src/build/android:%(PATH)s"
-    },
-    "name": "saving json to temp file",
-    "stdin": "{\"output\": [], \"results\": {\"values\": [0, 0]}, \"retcodes\": [0, 0]}",
-    "stdout": "/path/to/tmp/"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
-      "--",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "/tmp/dummy2",
-      "gs://chrome-perf/bisect-results/f7a7b4135624439cbd27fdd5133d74ec.results"
-    ],
-    "env": {
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/android_s5_perf_cq/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_s5_perf_cq/src/build/android:%(PATH)s"
-    },
-    "name": "gsutil upload",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chrome-perf/bisect-results/f7a7b4135624439cbd27fdd5133d74ec.results@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
       "\nimport glob, os, sys\nfor report in glob.glob(sys.argv[1]):\n  with open(report, 'r') as f:\n    for l in f.readlines():\n      print l\n  os.remove(report)\n",
       "[BUILDER_CACHE]/android_s5_perf_cq/src/out/Release/test_logs/*.log"
     ],
@@ -810,7 +746,7 @@
       "gs://chromium-android/logcat_dumps/android_s5_perf_cq/571"
     ],
     "cwd": "[BUILDER_CACHE]/android_s5_perf_cq",
-    "name": "gsutil upload (2)",
+    "name": "gsutil upload",
     "~followup_annotations": [
       "@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/android_s5_perf_cq/571@@@"
     ]