Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

build/android/pylib/local/device/local_device_instrumentation_test_run.py

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import logging
 import time
 
 from pylib import flag_changer
 from pylib.base import base_test_result
 from pylib.base import test_run
@@ skipping 106 matching lines @@
     time_ms = lambda: int(time.time() * 1e3)
     start_ms = time_ms()
     output = device.StartInstrumentation(
         '%s/%s' % (self._test_instance.test_package,
                    self._test_instance.test_runner),
         raw=True, extras=extras, timeout=timeout, retries=0)
     duration_ms = time_ms() - start_ms
 
     # TODO(jbudorick): Make instrumentation tests output a JSON so this
     # doesn't have to parse the output.
-    logging.debug('output from %s:', test_name)
+    logging.info('output from %s:' % test_name)
     for l in output:
-      logging.debug('  %s', l)
+      logging.info('  %s' % l)
 
-    result_code, result_bundle, statuses = (
-        self._test_instance.ParseAmInstrumentRawOutput(output))
-    results = self._test_instance.GenerateTestResults(
-        result_code, result_bundle, statuses, start_ms, duration_ms)
+    _, _, statuses = self._test_instance.ParseAmInstrumentRawOutput(output)
+    result = self._test_instance.GenerateTestResult(
+        test_name, statuses, start_ms, duration_ms)
     if DidPackageCrashOnDevice(self._test_instance.test_package, device):
-      for r in results:
-        if r.GetType() == base_test_result.ResultType.UNKNOWN:
-          r.SetType(base_test_result.ResultType.CRASH)
-    return results
+      result.SetType(base_test_result.ResultType.CRASH)
+    return result
 
   #override
   def _ShouldShard(self):
     return True
 
   @staticmethod
   def _GetTimeoutFromAnnotations(annotations, test_name):
     for k, v in TIMEOUT_ANNOTATIONS:
       if k in annotations:
         timeout = v
     else:
       logging.warning('Using default 1 minute timeout for %s' % test_name)
       timeout = 60
 
     try:
       scale = int(annotations.get('TimeoutScale', 1))
     except ValueError as e:
       logging.warning("Non-integer value of TimeoutScale ignored. (%s)", str(e))
       scale = 1
     timeout *= scale
 
     return timeout