tools/android/loading: Add support for multiple redirects.

tools/android/loading/request_dependencies_lens.py

Index: tools/android/loading/request_dependencies_lens.py
diff --git a/tools/android/loading/request_dependencies_lens.py b/tools/android/loading/request_dependencies_lens.py
index 47ea3af59722a692f7854c64fd3d7ecafa644301..1e91910d19b7059aea100f7b8c926ae04bc9750a 100644
--- a/tools/android/loading/request_dependencies_lens.py
+++ b/tools/android/loading/request_dependencies_lens.py
@@ -65,7 +65,7 @@ class RequestDependencyLens(object):
     reason = request.initiator['type']
     assert reason in request_track.Request.INITIATORS
     # Redirect suffixes are added in RequestTrack.

[blundell, 2016/01/26 13:23:44]

Is this comment still relevant?

[Benoit L, 2016/01/26 13:40:47]

Done.

-    if request.request_id.endswith(request_track.RequestTrack.REDIRECT_SUFFIX):
+    if reason == 'redirect':
       return self._GetInitiatingRequestRedirect(request)
     elif reason == 'parser':
       return self._GetInitiatingRequestParser(request)
@@ -76,14 +76,11 @@ class RequestDependencyLens(object):
       return self._GetInitiatingRequestOther(request)
 
   def _GetInitiatingRequestRedirect(self, request):
-    request_id = request.request_id[:request.request_id.index(
-        request_track.RequestTrack.REDIRECT_SUFFIX)]
-    assert request_id in self._requests_by_id
-    dependent_request = self._requests_by_id[request_id]
-    assert request.timing.request_time < \
-        dependent_request.timing.request_time, '.\n'.join(
-            [str(request), str(dependent_request)])
-    return (request, dependent_request, 'redirect')
+    assert request_track.Request.INITIATING_REQUEST in request.initiator
+    initiating_request_id = request.initiator[
+        request_track.Request.INITIATING_REQUEST]
+    assert initiating_request_id in self._requests_by_id
+    return (self._requests_by_id[initiating_request_id], request, 'redirect')
 
   def _GetInitiatingRequestParser(self, request):
     url = request.initiator['url']