Make test-results upload URL configurable.

scripts/slave/recipe_modules/test_results/api.py

Index: scripts/slave/recipe_modules/test_results/api.py
diff --git a/scripts/slave/recipe_modules/test_results/api.py b/scripts/slave/recipe_modules/test_results/api.py
index c1e9a3a4ecf02c89fcfabb33fb79dcdc9261ff26..7fdbc333bf44c94c8aab50840484eb62be4a6de4 100644
--- a/scripts/slave/recipe_modules/test_results/api.py
+++ b/scripts/slave/recipe_modules/test_results/api.py
@@ -8,9 +8,8 @@ from recipe_engine import recipe_api
 class TestResultsApi(recipe_api.RecipeApi):
   """Recipe module to upload gtest json results to test-results server."""
 
-  # TODO(estaab): Make test_results_server a configuration value.
   def upload(self, gtest_results_file, test_type, chrome_revision,
-             test_results_server, downgrade_error_to_warning=True):
+             test_results_server=None, downgrade_error_to_warning=True):
     """Upload gtest results json to test-results.
 
     Args:
@@ -24,7 +23,7 @@ class TestResultsApi(recipe_api.RecipeApi):
       The step result.
     """
     try:
-      self.m.python(
+      return self.m.python(
           name='Upload to test-results [%s]' % test_type,
           script=self.resource('upload_gtest_test_results.py'),
           args=['--input-gtest-json', gtest_results_file,
@@ -32,12 +31,10 @@ class TestResultsApi(recipe_api.RecipeApi):
                 '--builder-name', self.m.properties['buildername'],
                 '--build-number', self.m.properties['buildnumber'],
                 '--test-type', test_type,
-                '--test-results-server', test_results_server,
+                '--test-results-server',
+                test_results_server or self.c.test_results_server,
                 '--chrome-revision', chrome_revision])
-    finally:
-      step_result = self.m.step.active_result
-      if (downgrade_error_to_warning and
-          step_result.presentation.status == self.m.step.FAILURE):
-        step_result.presentation.status = self.m.step.WARNING
-      return step_result
-
+    except self.m.step.StepFailure as f:
+      if downgrade_error_to_warning:
+        f.result.presentation.status = self.m.step.WARNING
+      return f.result