Loading model test tweak.

tools/android/loading/loading_model.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.
 
 """Models for loading in chrome.
 
 (Redirect the following to the general model module once we have one)
 A model is an object with the following methods.
   CostMs(): return the cost of the model in milliseconds.
   Set(): set model-specific parameters.
@@ skipping 13 matching lines @@
 import dag
 import loading_trace
 import request_dependencies_lens
 import request_track
 
 class ResourceGraph(object):
   """A model of loading by a DAG of resource dependencies.
 
   See model parameters in Set().
   """
+  # The lens to build request dependencies. Exposed here for subclasses in
+  # unittesting.
+  REQUEST_LENS = request_dependencies_lens.RequestDependencyLens
+
   EDGE_KIND_KEY = 'edge_kind'
   EDGE_KINDS = request_track.Request.INITIATORS + (
       'script_inferred', 'after-load', 'before-load', 'timing')
   def __init__(self, trace, content_lens=None, frame_lens=None,
                activity=None):
     """Create from a LoadingTrace (or json of a trace).
 
     Args:
       trace: (LoadingTrace/JSON) Loading trace or JSON of a trace.
       content_lens: (ContentClassificationLens) Lens used to annotate the
@@ skipping 426 matching lines @@
       index_by_request[request] = next_index
       node = dag.Node(next_index)
       node_info = self._NodeInfo(node, request)
       if self._content_lens:
         node_info.SetRequestContent(
             self._content_lens.IsAdRequest(request),
             self._content_lens.IsTrackingRequest(request))
       self._nodes.append(node)
       self._node_info.append(node_info)
 
-    dependencies = request_dependencies_lens.RequestDependencyLens(
-        trace).GetRequestDependencies()
+    dependencies = self.REQUEST_LENS(trace).GetRequestDependencies()
     for dep in dependencies:
       (parent_rq, child_rq, reason) = dep
       parent = self._node_info[index_by_request[parent_rq]]
       child = self._node_info[index_by_request[child_rq]]
       edge_cost = request_track.TimeBetween(parent_rq, child_rq, reason)
       if edge_cost < 0:
         edge_cost = 0
         if child.StartTime() < parent.StartTime():
           logging.error('Inverted dependency: %s->%s',
                         parent.ShortName(), child.ShortName())
@@ skipping 115 matching lines @@
     """
     image_to_info = {}
     for n in self._node_info:
       if (n.ContentType() is not None and
           n.ContentType().startswith('image') and
           self.FilterAds(n)):
         key = str((n.Url(), n.ShortName(), n.StartTime()))
         assert key not in image_to_info, n.Url()
         image_to_info[key] = n
     return image_to_info