sandwich: Fixes some failures in request_track.py

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 677 matching lines @@
     self._requests_by_end = sorted(valid_requests,
                                      key=lambda r: r.end_msec)
     self._request_end_timestamps = [r.end_msec
                                     for r in self._requests_by_end]
     self._indexed = True
 
   def _RequestWillBeSent(self, request_id, params):
     # Several "requestWillBeSent" events can be dispatched in a row in the case
     # of redirects.
     redirect_initiator = None
+    if request_id in self._completed_requests_by_id:
+      assert request_id not in self._requests_in_flight
+      return
     if request_id in self._requests_in_flight:
       redirect_initiator = self._HandleRedirect(request_id, params)
-    assert (request_id not in self._requests_in_flight
-            and request_id not in self._completed_requests_by_id)
+    assert (request_id not in self._requests_in_flight)
     r = Request()
     r.request_id = request_id
     _CopyFromDictToObject(
         params, r, (('frameId', 'frame_id'), ('loaderId', 'loader_id'),
                     ('documentURL', 'document_url'),
                     ('timestamp', 'timestamp'), ('wallTime', 'wall_time'),
                     ('initiator', 'initiator')))
     request = params['request']
     _CopyFromDictToObject(
         request, r, (('url', 'url'), ('method', 'method'),
@@ skipping 40 matching lines @@
     return initiator
 
   def _RequestServedFromCache(self, request_id, _):
     if request_id not in self._requests_in_flight:
       return
     (request, status) = self._requests_in_flight[request_id]
     assert status == RequestTrack._STATUS_SENT
     request.served_from_cache = True
 
   def _ResponseReceived(self, request_id, params):
+    if request_id in self._completed_requests_by_id:
+      assert request_id not in self._requests_in_flight
+      return
     assert request_id in self._requests_in_flight
     (r, status) = self._requests_in_flight[request_id]
     if status == RequestTrack._STATUS_RESPONSE:
       # Duplicated messages (apart from the timestamp) are OK.
       old_params = self._request_id_to_response_received[request_id]
       params_copy = copy.deepcopy(params)
       params_copy['timestamp'] = None
       old_params['timestamp'] = None
       assert params_copy == old_params
       self.duplicates_count += 1
       return
     assert status == RequestTrack._STATUS_SENT
-    assert r.frame_id == params['frameId']
+    assert (r.frame_id == params['frameId'] or
+            params['response']['protocol'] == 'data')
     assert r.timestamp <= params['timestamp']
     if r.resource_type == 'Other':
       r.resource_type = params.get('type', 'Other')
     else:
       assert r.resource_type == params.get('type', 'Other')
     response = params['response']
     _CopyFromDictToObject(
         response, r, (('status', 'status'), ('mimeType', 'mime_type'),
                       ('fromDiskCache', 'from_disk_cache'),
                       ('fromServiceWorker', 'from_service_worker'),
@@ skipping 24 matching lines @@
     r.data_chunks.append((offset, params['encodedDataLength']))
     self._requests_in_flight[request_id] = (r, RequestTrack._STATUS_DATA)
 
   def _LoadingFinished(self, request_id, params):
     if request_id not in self._requests_in_flight:
       return
     (r, status) = self._requests_in_flight[request_id]
     assert (status == RequestTrack._STATUS_RESPONSE
             or status == RequestTrack._STATUS_DATA)
     r.encoded_data_length = params['encodedDataLength']
-    assert (r.encoded_data_length > 0 or r.protocol == 'about' or
+    assert (r.encoded_data_length > 0 or r.protocol in {'about', 'data'} or
             r.from_disk_cache or r.served_from_cache)
     r.timing.loading_finished = r._TimestampOffsetFromStartMs(
         params['timestamp'])
     self._requests_in_flight[request_id] = (r, RequestTrack._STATUS_FINISHED)
     self._FinalizeRequest(request_id)
 
   def _LoadingFailed(self, request_id, params):
     if request_id not in self._requests_in_flight:
       logging.warning('An unknown request failed: %s' % request_id)
       return
     (r, _) = self._requests_in_flight[request_id]
     r.failed = True
     r.error_text = params['errorText']
     self._requests_in_flight[request_id] = (r, RequestTrack._STATUS_FINISHED)
     self._FinalizeRequest(request_id)
 
   def _FinalizeRequest(self, request_id):
-    if request_id not in self._requests_in_flight:
-      return
     (request, status) = self._requests_in_flight[request_id]
     assert status == RequestTrack._STATUS_FINISHED
     del self._requests_in_flight[request_id]
     self._completed_requests_by_id[request_id] = request
     self._requests.append(request)
 
   def __eq__(self, o):
     return self._requests == o._requests
 
 
@@ skipping 13 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)