[Android] Uploaded instrumentation tests to prod flakiness dashboard.

build/android/pylib/base/test_result.py

Index: build/android/pylib/base/test_result.py
diff --git a/build/android/pylib/base/test_result.py b/build/android/pylib/base/test_result.py
index 0c78d221779fea4e3511af5b31543a62a1113fea..74285bf2a362eadd304e031e791f58e69024ed93 100644
--- a/build/android/pylib/base/test_result.py
+++ b/build/android/pylib/base/test_result.py
@@ -15,9 +15,6 @@ from pylib import constants
 from pylib.utils import flakiness_dashboard_results_uploader
 
 
-_STAGING_SERVER = 'chrome-android-staging'
-
-
 class BaseTestResult(object):
   """A single result from a unit test."""
 
@@ -179,15 +176,13 @@ class TestResults(object):
       return
 
     try:
-      # TODO(frankf): Temp server for initial testing upstream.
-      # Use http://test-results.appspot.com once we're confident this works.
-      if _STAGING_SERVER in flakiness_server:
+      if flakiness_server == constants.UPSTREAM_FLAKINESS_SERVER:
           assert test_package in ['ContentShellTest',
                                   'ChromiumTestShellTest',
                                   'AndroidWebViewTest']
           dashboard_test_type = ('%s_instrumentation_tests' %
                                  test_package.lower().rstrip('test'))
-      # Downstream prod server.
+      # Downstream server.
       else:
         dashboard_test_type = 'Chromium_Android_Instrumentation'