Make test-results upload URL configurable.

scripts/slave/recipes/chromium.expected/dynamic_gtest_android.json

Index: scripts/slave/recipes/chromium.expected/dynamic_gtest_android.json
diff --git a/scripts/slave/recipes/chromium.expected/dynamic_instrumentation_test_with_timeout_scale.json b/scripts/slave/recipes/chromium.expected/dynamic_gtest_android.json
similarity index 96%
copy from scripts/slave/recipes/chromium.expected/dynamic_instrumentation_test_with_timeout_scale.json
copy to scripts/slave/recipes/chromium.expected/dynamic_gtest_android.json
index d4726caa3228d8ff30a6d84949e1f67a1e545702..95cb344f14d6e04f193808fa7803caa968df3605 100644
--- a/scripts/slave/recipes/chromium.expected/dynamic_instrumentation_test_with_timeout_scale.json
+++ b/scripts/slave/recipes/chromium.expected/dynamic_gtest_android.json
@@ -7,7 +7,7 @@
       "--master",
       "chromium.android",
       "--builder",
-      "Lollipop Low-end Tester",
+      "Lollipop Phone Tester",
       "--slave",
       "TestSlavename",
       "--spec",
@@ -188,7 +188,7 @@
       "--paths",
       "{\"checkout\": \"[SLAVE_BUILD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
       "--properties",
-      "{\"buildername\": \"Lollipop Low-end Tester\", \"buildnumber\": 571, \"mastername\": \"chromium.android\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
+      "{\"buildername\": \"Lollipop Phone Tester\", \"buildnumber\": 571, \"mastername\": \"chromium.android\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
     ],
     "name": "get compile targets for scripts",
     "~followup_annotations": [
@@ -208,11 +208,10 @@
     "~followup_annotations": [
       "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.android.json@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"Lollipop Low-end Tester\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"instrumentation_tests\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"Lollipop Phone Tester\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"gtest_tests\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"test\": \"ChromePublicTest\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"timeout_scale\": 2@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"test\": \"base_unittests\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -534,14 +533,13 @@
     "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/src/out/Debug/bin/run_chrome_public_test_apk",
+      "[SLAVE_BUILD]/src/out/Debug/bin/run_base_unittests",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
       "--verbose",
+      "--flakiness-dashboard-server=test-results.appspot.com",
       "--json-results-file",
       "/path/to/tmp/json",
-      "--timeout-scale",
-      "2",
       "--adb-path",
       "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
     ],
@@ -549,12 +547,7 @@
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
-    "name": "ChromePublicTest",
-    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
-      "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
-      "@@@STEP_FAILURE@@@"
-    ]
+    "name": "base_unittests"
   },
   {
     "cmd": [
@@ -562,15 +555,15 @@
       "-u",
       "RECIPE_MODULE[build::test_results]/resources/upload_gtest_test_results.py",
       "--input-gtest-json",
-      "{\"per_iteration_data\": [{\"Test.One\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Three\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Two\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"FAILURE\"}]}]}",
+      "{\"per_iteration_data\": [{\"Test.One\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Three\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Two\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}]}]}",
       "--master-name",
       "chromium.android",
       "--builder-name",
-      "Lollipop Low-end Tester",
+      "Lollipop Phone Tester",
       "--build-number",
       "571",
       "--test-type",
-      "ChromePublicTest",
+      "base_unittests",
       "--test-results-server",
       "test-results.appspot.com",
       "--chrome-revision",
@@ -580,7 +573,7 @@
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
-    "name": "Upload to test-results [ChromePublicTest]"
+    "name": "Upload to test-results [base_unittests]"
   },
   {
     "cmd": [
@@ -627,7 +620,7 @@
       "----",
       "cp",
       "[SLAVE_BUILD]/src/out/Debug/full_log",
-      "gs://chromium-android/logcat_dumps/Lollipop Low-end Tester/571"
+      "gs://chromium-android/logcat_dumps/Lollipop Phone Tester/571"
     ],
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
@@ -635,7 +628,7 @@
     },
     "name": "gsutil upload",
     "~followup_annotations": [
-      "@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/Lollipop Low-end Tester/571@@@"
+      "@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/Lollipop Phone Tester/571@@@"
     ]
   },
   {
@@ -706,8 +699,7 @@
   },
   {
     "name": "$result",
-    "reason": "1 tests failed: ['ChromePublicTest']",
     "recipe_result": null,
-    "status_code": 1
+    "status_code": 0
   }
 ]