Update from https://crrev.com/329939

build/android/pylib/remote/device/remote_device_test_run.py

 # Copyright 2014 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 json
 import logging
 import os
 import sys
@@ skipping 11 matching lines @@
 class RemoteDeviceTestRun(test_run.TestRun):
   """Run tests on a remote device."""
 
   _TEST_RUN_KEY = 'test_run'
   _TEST_RUN_ID_KEY = 'test_run_id'
 
   WAIT_TIME = 5
   COMPLETE = 'complete'
   HEARTBEAT_INTERVAL = 300
 
-  _RESULTS_FILE = 'appurify_results/result.txt'
-
   def __init__(self, env, test_instance):
     """Constructor.
 
     Args:
       env: Environment the tests will run in.
       test_instance: The test that will be run.
     """
     super(RemoteDeviceTestRun, self).__init__(env, test_instance)
     self._env = env
     self._test_instance = test_instance
@@ skipping 135 matching lines @@
     """
     if results_path:
       logging.info('Downloading results to %s.' % results_path)
       if not os.path.exists(os.path.dirname(results_path)):
         os.makedirs(os.path.dirname(results_path))
       with appurify_sanitized.SanitizeLogging(self._env.verbose_count,
                                               logging.WARNING):
         appurify_sanitized.utils.wget(self._results['results']['url'],
                                       results_path)
 
-  def _GetRawTestOutput(self):
-    """Returns the test output."""
-    # TODO(mikecase): Remove getting results from zip when b/18981674 is fixed.
-    results_zipfile = self._env.results_path
-    if results_zipfile and os.path.exists(results_zipfile):
-      with zipfile.ZipFile(results_zipfile) as z:
-        with z.open(self._RESULTS_FILE, 'r') as r:
-          return r.read()
-    else:
-      logging.warning(
-          'If the test output is too long, some test results may get cut off.')
-      logging.warning(
-          'Use the --results-path option to ensure you get the full results.')
-      return self._results['results']['output']
-
   def _GetTestStatus(self, test_run_id):
     """Checks the state of the test, and sets self._results
 
     Args:
       test_run_id: Id of test on on remote service.
     """
 
     with appurify_sanitized.SanitizeLogging(self._env.verbose_count,
                                             logging.WARNING):
       test_check_res = appurify_sanitized.api.tests_check_result(
@@ skipping 102 matching lines @@
           '%s=%s' % (k, v) for k, v in runner_configs.iteritems())
       config.write(''.join('%s\n' % l for l in config_data))
       config.flush()
       config.seek(0)
       with appurify_sanitized.SanitizeLogging(self._env.verbose_count,
                                               logging.WARNING):
         config_response = appurify_sanitized.api.config_upload(
             self._env.token, config, self._test_id)
       remote_device_helper.TestHttpResponse(
           config_response, 'Unable to upload test config.')