Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

build/android/pylib/remote/device/remote_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.
 
 """Run specific test on specific environment."""
 
 import logging
 import os
 import tempfile
 
@@ skipping 22 matching lines @@
   def _ParseTestResults(self):
     logging.info('Parsing results from stdout.')
     r = base_test_result.TestRunResults()
 
     if self._results['results']['exception']:
       r.AddResult(base_test_result.BaseTestResult(
           self._results['results']['exception'],
           base_test_result.ResultType.FAIL))
       return r
 
-    result_code, result_bundle, statuses = (
-        self._test_instance.ParseAmInstrumentRawOutput(
-            self._results['results']['output'].splitlines()))
-    result = self._test_instance.GenerateTestResults(
-        result_code, result_bundle, statuses, 0, 0)
+    _, errors, parsed_output = self._test_instance.ParseAmInstrumentRawOutput(
+        self._results['results']['output'].splitlines())
+    logging.debug(errors)
+    result = self._test_instance.GenerateMultiTestResult(errors, parsed_output)
 
     if isinstance(result, base_test_result.BaseTestResult):
       r.AddResult(result)
     elif isinstance(result, list):
       r.AddResults(result)
     else:
       raise Exception('Unexpected result type: %s' % type(result).__name__)
 
     return r