tools/android/loading Add 'redirect' and 'ping' content types.

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 bisect
@@ skipping 161 matching lines @@
     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
 
+  """Gets the value of a HTTP response header.

[Benoit L, 2016/02/18 11:01:27]

docstrings go below the function name, not above.

+
+  Does a case-insensitive search for the header name in the HTTP response
+  headers, in order to support servers that use a wrong capitalization.
+  """
+  def GetHTTPResponseHeader(self, header_name):
+    small_caps_name = header_name.lower()

[Benoit L, 2016/02/18 11:01:27]

nit: lower_case_name?

+    result = None
+    for name, value in self.response_headers.iteritems():
+      if name.lower() == small_caps_name:
+        result = value
+        break
+    return result
+
   def GetContentType(self):
     """Returns the content type, or None."""
+    # Check for redirects. Use the "Location" header, because the HTTP status is
+    # not reliable.
+    if self.GetHTTPResponseHeader('Location') is not None:
+      return 'redirect'
+
+    # Check if the response is empty.
+    if (self.GetHTTPResponseHeader('Content-Length') == '0' or
+        self.status == 204):
+      return 'ping'
+
     if self.mime_type:
       return self.mime_type
 
-    # Case-insensitive search because servers sometimes use a wrong
-    # capitalization.
-    content_type = None
-    for header, value in self.response_headers.iteritems():
-      if header.lower() == 'content-type':
-        content_type = value
-        break
-
+    content_type = self.GetHTTPResponseHeader('Content-Type')
     if not content_type or ';' not in content_type:
       return content_type
     else:
       return content_type[:content_type.index(';')]
 
   def IsDataRequest(self):
     return self.protocol == 'data'
 
   def MaxAge(self):
     """Returns the max-age of a resource, or -1."""
     # TODO(lizeb): Handle the "Expires" header as well.
     cache_control = {}
     if not self.response_headers:
       return -1
 
-    # Case-insensitive search because servers sometimes use a wrong
-    # capitalization.
-    cache_control_str = None
-    for header, value in self.response_headers.iteritems():
-      if header.lower() == 'cache-control':
-        cache_control_str = value
-        break
-
+    cache_control_str = self.GetHTTPResponseHeader('Cache-Control')
     if cache_control_str is not None:
       directives = [s.strip() for s in cache_control_str.split(',')]
       for directive in directives:
         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
@@ skipping 326 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)