(Reland) Insert logcat as part of test result for android instrumentation tests.

build/android/pylib/results/json_results.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.
 
 import collections
 import itertools
 import json
 
 from pylib.base import base_test_result
 
@@ skipping 84 matching lines @@
       results_iterable = test_run_result.GetAll()
 
     for r in results_iterable:
       result_dict = {
           'status': status_as_string(r.GetType()),
           'elapsed_time_ms': r.GetDuration(),
           'output_snippet': r.GetLog(),
           'losless_snippet': '',
           'output_snippet_base64:': '',
           'tombstones': r.GetTombstones() or '',
+          'logcat_url': r.GetLogcatUrl() or '',
       }
       iteration_data[r.GetName()].append(result_dict)
 
     all_tests = all_tests.union(set(iteration_data.iterkeys()))
     per_iteration_data.append(iteration_data)
 
   return {
     'global_tags': [],
     'all_tests': sorted(list(all_tests)),
     # TODO(jbudorick): Add support for disabled tests within base_test_result.
@@ skipping 42 matching lines @@
   testsuite_runs = json_results['per_iteration_data']
   for testsuite_run in testsuite_runs:
     for test, test_runs in testsuite_run.iteritems():
       results_list.extend(
           [base_test_result.BaseTestResult(test,
                                            string_as_status(tr['status']),
                                            duration=tr['elapsed_time_ms'])
           for tr in test_runs])
   return results_list