clovis: Don't pretty-print JSON traces.

tools/android/loading/analyze.py

 #! /usr/bin/python
 # 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 argparse
 import cgi
 import json
 import logging
 import os
@@ skipping 41 matching lines @@
     url: url as a string to load.
   """
   load_intent = intent.Intent(
       package=OPTIONS.ChromePackage().package,
       activity=OPTIONS.ChromePackage().activity,
       data=url)
   logging.warning('Loading ' + url)
   device.StartActivity(load_intent, blocking=True)
 
 
-def _WriteJson(output, json_data):
-  """Write JSON data in a nice way.
-
-  Args:
-    output: a file object
-    json_data: JSON data as a dict.
-  """
-  json.dump(json_data, output, sort_keys=True, indent=2)
-
-
 def _GetPrefetchHtml(graph_view, name=None):
   """Generate prefetch page for the resources in resource graph.
 
   Args:
     graph_view: (LoadingGraphView)
     name: optional string used in the generated page.
 
   Returns:
     HTML as a string containing all the link rel=prefetch directives necessary
     for prefetching the given ResourceGraph.
@@ skipping 65 matching lines @@
     # We hope that the tmpfile name is unique enough for the device.
     target = os.path.join('/sdcard/Download', os.path.basename(tmp.name))
     device = device_setup.GetFirstDevice()
     device.adb.Push(tmp.name, target)
     logging.warning('Pushed prefetch %s to device at %s' % (tmp.name, target))
     _LoadPage(device, 'file://' + target)
     time.sleep(OPTIONS.prefetch_delay_seconds)
     logging.warning('Warm fetch')
     warm_data = _LogRequests(url, clear_cache_override=False)
     with open(json_output, 'w') as f:
-      _WriteJson(f, warm_data)
+      json.dump(warm_data, f)
     logging.warning('Wrote ' + json_output)
     with open(json_output + '.cold', 'w') as f:
-      _WriteJson(f, cold_data)
+      json.dump(cold_data, f)
     logging.warning('Wrote ' + json_output + '.cold')
   else:
     with open(json_output, 'w') as f:
-      _WriteJson(f, cold_data)
+      json.dump(cold_data, f)
     logging.warning('Wrote ' + json_output)
 
 
 def _ProcessTraceFile(filename):
   with open(filename) as f:
     return _ProcessJsonTrace(json.load(f))
 
 
 def _ProcessJsonTrace(json_dict):
     trace = loading_trace.LoadingTrace.FromJsonDict(json_dict)
@@ skipping 143 matching lines @@
   parser.add_argument('command', help=' '.join(COMMAND_MAP.keys()))
   parser.add_argument('rest', nargs=argparse.REMAINDER)
   args = parser.parse_args()
   devil_chromium.Initialize()
   COMMAND_MAP.get(args.command,
                   lambda _: InvalidCommand(args.command))(args.rest)
 
 
 if __name__ == '__main__':
   main()