Android / Telemetry: final cleanup on perf_tests_helper.

build/android/pylib/instrumentation/test_runner.py

Index: build/android/pylib/instrumentation/test_runner.py
diff --git a/build/android/pylib/instrumentation/test_runner.py b/build/android/pylib/instrumentation/test_runner.py
index 21a5c459d955dad7d56d3d071deba8aee6a864a6..5e6c1266085689276777636bdfa7dfaf856b7c82 100644
--- a/build/android/pylib/instrumentation/test_runner.py
+++ b/build/android/pylib/instrumentation/test_runner.py
@@ -9,10 +9,15 @@ import os
 import re
 import time
 
+
+sys.path.append(os.path.join(sys.path[0],

[frankf, 2013/09/20 02:07:39]

import sys

[bulach, 2013/09/20 08:23:46]

Done.

+                             os.pardir, os.pardir, 'build', 'util', 'lib',
+                             'common'))
+import perf_tests_results_helper
+
 from pylib import android_commands
 from pylib import constants
 from pylib import flag_changer
-from pylib import perf_tests_helper
 from pylib import valgrind_tools
 from pylib.base import base_test_result
 from pylib.base import base_test_runner
@@ -283,9 +288,9 @@ class TestRunner(base_test_runner.BaseTestRunner):
           # Process the performance data
           result = json_perf_parser.GetAverageRunInfoFromJSONString(json_string,
                                                                     perf_set[0])
-          perf_tests_helper.PrintPerfResult(perf_set[1], perf_set[2],
-                                            [result['average']],
-                                            result['units'])
+          perf_tests_results_helper.PrintPerfResult(perf_set[1], perf_set[2],
+                                                    [result['average']],
+                                                    result['units'])
 
   def _SetupIndividualTestTimeoutScale(self, test):
     timeout_scale = self._GetIndividualTestTimeoutScale(test)