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

tools/android/loading/loading_model_unittest.py

 # Copyright 2015 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 os
 import sys
 import unittest
 
 import dag
 import loading_model
 import loading_trace
 import request_track
 import request_dependencies_lens
 
 
 class SimpleLens(object):
   def __init__(self, trace):
     self._trace = trace
 
   def GetRequestDependencies(self):
     url_to_rq = {}
     deps = []
     for rq in self._trace.request_track.GetEvents():
       assert rq.url not in url_to_rq
       url_to_rq[rq.url] = rq
     for rq in self._trace.request_track.GetEvents():
       if rq.initiator in url_to_rq:
-        deps.append((rq, url_to_rq[rq.initiator], ''))
+        deps.append(( url_to_rq[rq.initiator], rq, ''))
     return deps
 
 
 class MockRequestTrack(object):
   def __init__(self, requests):
     self._requests = requests
 
   def GetEvents(self):
     return self._requests
 
@@ skipping 148 matching lines @@
 
     self.assertTrue(loading_model.ResourceGraph._IsAdUrl(
         'http://ums.adtechus.com/mapuser?providerid=1003;'
         'userid=RUmecco4z3o===='))
     self.assertTrue(loading_model.ResourceGraph._IsAdUrl(
         'http://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js'))
 
 
 if __name__ == '__main__':
   unittest.main()