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

tools/android/loading/request_dependencies_lens.py

 # Copyright 2016 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.
 
 """Gathers and infers dependencies between requests.
 
 When executed as a script, loads a trace and outputs the dependencies.
 """
 
 import collections
@@ skipping 108 matching lines @@
     Args:
       url: (str) URL to match in requests.
       before_timestamp: (int) Only keep requests submitted before a given
                         timestamp.
 
     Returns:
       A list of candidates, ordered by timestamp.
     """
     candidates = self._requests_by_url.get(url, [])
     candidates = [r for r in candidates if (
-        r.timestamp + max(0, r.timing.receive_headers_end) <= before_timestamp)]
+        r.timestamp + max(
+            0, r.timing.receive_headers_end / 1000) <= before_timestamp)]
     candidates.sort(key=operator.attrgetter('timestamp'))
     return candidates
 
   def _FindBestMatchingInitiator(self, request, matches):
     """Returns the best matching request within a list of matches.
 
     Iteratively removes candidates until one is left:
     - With the same parent frame.
     - From the same frame.
 
@@ skipping 10 matching lines @@
     if not matches:
       return None
     if len(matches) == 1:
       return matches[0]
     # Several matches, try to reduce this number to 1. Otherwise, return the
     # most recent one.
     if request.frame_id in self._frame_to_parent: # Main frame has no parent.
       parent_frame_id = self._frame_to_parent[request.frame_id]
       same_parent_matches = [
           r for r in matches
-          if self._frame_to_parent[r.frame_id] == parent_frame_id]
+          if r.frame_id in self._frame_to_parent and
+          self._frame_to_parent[r.frame_id] == parent_frame_id]
       if not same_parent_matches:
         logging.warning('All matches are from non-sibling frames.')
         return matches[-1]
       if len(same_parent_matches) == 1:
         return same_parent_matches[0]
     same_frame_matches = [r for r in matches if r.frame_id == request.frame_id]
     if not same_frame_matches:
       logging.warning('All matches are from non-sibling frames.')
       return matches[-1]
     if len(same_frame_matches) == 1:
       return same_frame_matches[0]
     else:
       logging.warning('Several matches')
       return same_frame_matches[-1]
 
 
 if __name__ == '__main__':
   import json
   import sys
   trace_filename = sys.argv[1]
   json_dict = json.load(open(trace_filename, 'r'))
   lens = RequestDependencyLens(
       loading_trace.LoadingTrace.FromJsonDict(json_dict))
   depedencies = lens.GetRequestDependencies()
   for (first, second, dep_reason) in depedencies:
     print '%s -> %s\t(%s)' % (first.request_id, second.request_id, dep_reason)