Upgrade analyze.py and related scripts to new world order.

tools/android/loading/processing.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 json
 import os
 import os.path
 import sys
 
-import log_parser
 import loading_model
+import loading_trace
 
 
 def SitesFromDir(directory):
   """Extract sites from a data directory.
 
   Based on ./analyze.py fetch file name conventions. We assume each site
   corresponds to two files, <site>.json and <site>.json.cold, and that no other
   kind of file appears in the data directory.
 
   Args:
@@ skipping 24 matching lines @@
 
   Based on ./analyze.py fetch file name conventions.
 
   Args:
     datadir: the directory containing site JSON data.
     site: a site string.
 
   Returns:
     A loading model object.
   """
-  return loading_model.ResourceGraph(log_parser.FilterRequests(
-      log_parser.ParseJsonFile(os.path.join(datadir, site + '.json'))))
+  with file(os.path.join(datadir, site + '.json')) as f:
+    return loading_model.ResourceGraph(loading_trace.LoadingTrace.FromJsonDict(
+        json.load(f)))
 
 
 def ColdGraph(datadir, site):
   """Return a loading model graph for the cold pull of site.
 
   Based on ./analyze.py fetch file name conventions.
 
   Args:
     datadir: the directory containing site JSON data.
     site: a site string.
 
   Returns:
     A loading model object.
   """
-  return loading_model.ResourceGraph(log_parser.FilterRequests(
-      log_parser.ParseJsonFile(os.path.join(datadir, site + '.json.cold'))))
+  with file(os.path.join(datadir, site + '.json.cold')) as f:
+    return loading_model.ResourceGraph(loading_trace.LoadingTrace.FromJsonDict(

[blundell, 2016/01/21 14:11:38]

given the number of times that you're doing this, should we have a constructor
for LoadingTrace and/or ResourceGraph that takes in the filename and does the
work internally?

[mattcary, 2016/01/21 16:11:35]

I am going to have ResourceGraph take a json dict in the constructor. I like
keeping file opening as high up as possible as it makes testing & exception
handling a lot easier.

+        json.load(f)))