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

tools/android/loading/request_dependencies_lens_unittest.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.
 
 import unittest
 
 import devtools_monitor
 from loading_trace import LoadingTrace
 from request_dependencies_lens import RequestDependencyLens
 from request_track import (Request, TimingFromDict)
 import test_utils
 
 
 class RequestDependencyLensTestCase(unittest.TestCase):
   _REDIRECT_REQUEST = Request.FromJsonDict(
-      {'url': 'http://bla.com', 'request_id': '1234.1.redirect',
+      {'url': 'http://bla.com', 'request_id': '1234.redirect.1',
        'initiator': {'type': 'other'},
        'timestamp': 1, 'timing': TimingFromDict({})})
+  _REDIRECTED_REQUEST = Request.FromJsonDict({
+      'url': 'http://bla.com',
+      'request_id': '1234.1',
+      'frame_id': '123.1',
+      'initiator': {'type': 'redirect',
+                    'initiating_request': '1234.redirect.1'},
+      'timestamp': 2,
+      'timing': TimingFromDict({})})
   _REQUEST = Request.FromJsonDict({'url': 'http://bla.com',
                                    'request_id': '1234.1',
                                    'frame_id': '123.1',
                                    'initiator': {'type': 'other'},
                                    'timestamp': 2,
                                    'timing': TimingFromDict({})})
   _JS_REQUEST = Request.FromJsonDict({'url': 'http://bla.com/nyancat.js',
                                       'request_id': '1234.12',
                                       'frame_id': '123.1',
                                       'initiator': {'type': 'parser',
@@ skipping 19 matching lines @@
        'frame_id': '123.1',
        'initiator': {'type': 'script',
                      'stackTrace': [{'url': 'unknown'},
                                     {'url': 'http://bla.com/nyancat.js'}]},
        'timestamp': 10, 'timing': TimingFromDict({})})
   _PAGE_EVENTS = [{'method': 'Page.frameAttached',
                    'frame_id': '123.13', 'parent_frame_id': '123.1'}]
 
   def testRedirectDependency(self):
     loading_trace = test_utils.LoadingTraceFromEvents(
-        [self._REDIRECT_REQUEST, self._REQUEST])
+        [self._REDIRECT_REQUEST, self._REDIRECTED_REQUEST])
     request_dependencies_lens = RequestDependencyLens(loading_trace)
     deps = request_dependencies_lens.GetRequestDependencies()
     self.assertEquals(1, len(deps))
     (first, second, reason) = deps[0]
     self.assertEquals('redirect', reason)
     self.assertEquals(self._REDIRECT_REQUEST.request_id, first.request_id)
     self.assertEquals(self._REQUEST.request_id, second.request_id)
 
   def testScriptDependency(self):
     loading_trace = test_utils.LoadingTraceFromEvents(
@@ skipping 10 matching lines @@
         [self._REQUEST, self._JS_REQUEST])
     request_dependencies_lens = RequestDependencyLens(loading_trace)
     deps = request_dependencies_lens.GetRequestDependencies()
     self.assertEquals(1, len(deps))
     self._AssertDependencyIs(
         deps[0],
         self._REQUEST.request_id, self._JS_REQUEST.request_id, 'parser')
 
   def testSeveralDependencies(self):
     loading_trace = test_utils.LoadingTraceFromEvents(
-        [self._REDIRECT_REQUEST, self._REQUEST, self._JS_REQUEST,
+        [self._REDIRECT_REQUEST, self._REDIRECTED_REQUEST, self._JS_REQUEST,
          self._JS_REQUEST_2])
     request_dependencies_lens = RequestDependencyLens(loading_trace)
     deps = request_dependencies_lens.GetRequestDependencies()
     self.assertEquals(3, len(deps))
     self._AssertDependencyIs(
         deps[0], self._REDIRECT_REQUEST.request_id, self._REQUEST.request_id,
         'redirect')
     self._AssertDependencyIs(
         deps[1],
         self._REQUEST.request_id, self._JS_REQUEST.request_id, 'parser')
@@ skipping 29 matching lines @@
   def _AssertDependencyIs(
       self, dep, first_request_id, second_request_id, reason):
     (first, second, dependency_reason) = dep
     self.assertEquals(reason, dependency_reason)
     self.assertEquals(first_request_id, first.request_id)
     self.assertEquals(second_request_id, second.request_id)
 
 
 if __name__ == '__main__':
   unittest.main()