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

tools/android/loading/request_track.py

 # Copyright (c) 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.
 
 """The request data track.
 
 When executed, parses a JSON dump of DevTools messages.
 """
 
 import collections
 import copy
+import json
 import logging
+import re
 
 import devtools_monitor
 
 
 _TIMING_NAMES_MAPPING = {
     'connectEnd': 'connect_end', 'connectStart': 'connect_start',
     'dnsEnd': 'dns_end', 'dnsStart': 'dns_start', 'proxyEnd': 'proxy_end',
     'proxyStart': 'proxy_start', 'receiveHeadersEnd': 'receive_headers_end',
     'requestTime': 'request_time', 'sendEnd': 'send_end',
     'sendStart': 'send_start', 'sslEnd': 'ssl_end', 'sslStart': 'ssl_start',
     'workerReady': 'worker_ready', 'workerStart': 'worker_start',
     'loadingFinished': 'loading_finished'}
 
 Timing = collections.namedtuple('Timing', _TIMING_NAMES_MAPPING.values())
 
+def TimingAsList(timing):
+  """Transform Timing to a list, eg as is used in JSON output.
+
+  Args:
+    timing: a Timing.
+
+  Returns:
+    A list identical to what the eventual JSON output will be (eg,
+    Request.ToJsonDict).
+  """
+  return json.loads(json.dumps(timing))
 
 class Request(object):
   """Represents a single request.
 
   Generally speaking, fields here closely mirror those documented in
   third_party/WebKit/Source/devtools/protocol.json.
 
   Fields:
     request_id: (str) unique request ID. Postfixed with REDIRECT_SUFFIX for
                 redirects.
@@ skipping 57 matching lines @@
     return (timestamp - request_time) * 1000
 
   def ToJsonDict(self):
     return copy.deepcopy(self.__dict__)
 
   @classmethod
   def FromJsonDict(cls, data_dict):
     result = Request()
     for (k, v) in data_dict.items():
       setattr(result, k, v)
+    if not result.response_headers:
+      result.response_headers = {}
     if result.timing:
       result.timing = Timing(*result.timing)
+    else:
+      result.timing = TimingFromDict({'requestTime': result.timestamp})
     return result
 
   def GetContentType(self):
     """Returns the content type, or None."""
     content_type = self.response_headers.get('Content-Type', None)
     if not content_type or ';' not in content_type:
       return content_type
     else:
       return content_type[:content_type.index(';')]
 
@@ skipping 13 matching lines @@
         parts = [s.strip() for s in directive.split('=')]
         if len(parts) == 1:
           cache_control[parts[0]] = True
         else:
           cache_control[parts[0]] = parts[1]
     if (u'no-store' in cache_control
         or u'no-cache' in cache_control
         or len(cache_control) == 0):
       return -1
     if 'max-age' in cache_control:
-      return int(cache_control['max-age'])
+      age_match = re.match(r'\s*(\d+)+', cache_control['max-age'])
+      if not age_match:
+        return -1
+      return int(age_match.group(1))
     return -1
 
   def __eq__(self, o):
     return self.__dict__ == o.__dict__
 
   def __hash__(self):
     return hash(self.request_id)
 
 
 class RequestTrack(devtools_monitor.Track):
@@ skipping 179 matching lines @@
 
 
 if __name__ == '__main__':
   import json
   import sys
   events = json.load(open(sys.argv[1], 'r'))
   request_track = RequestTrack(None)
   for event in events:
     event_method = event['method']
     request_track.Handle(event_method, event)