[DevTools] Explicitly require ResourceTreeModel

third_party/WebKit/Source/devtools/front_end/resources/ResourcesPanel.js

Index: third_party/WebKit/Source/devtools/front_end/resources/ResourcesPanel.js
diff --git a/third_party/WebKit/Source/devtools/front_end/resources/ResourcesPanel.js b/third_party/WebKit/Source/devtools/front_end/resources/ResourcesPanel.js
index 86fdd7720f707b06679b7b701f99c2b99012c703..842bf268c40775dfc2f8bc90efe25ee81507de3d 100644
--- a/third_party/WebKit/Source/devtools/front_end/resources/ResourcesPanel.js
+++ b/third_party/WebKit/Source/devtools/front_end/resources/ResourcesPanel.js
@@ -173,14 +173,14 @@ WebInspector.ResourcesPanel.prototype = {
         var cacheStorageModel = WebInspector.ServiceWorkerCacheModel.fromTarget(this._target);
         if (cacheStorageModel)
             cacheStorageModel.enable();
-
-        if (this._target.hasBrowserCapability())
-            this._populateResourceTree();
-
+        var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(this._target);
+        if (resourceTreeModel) {
+            this._populateResourceTree(resourceTreeModel);
+            this._populateApplicationCacheTree(resourceTreeModel);
+        }
         var domStorageModel = WebInspector.DOMStorageModel.fromTarget(this._target);
         if (domStorageModel)
             this._populateDOMStorageTree(domStorageModel);
-        this._populateApplicationCacheTree();
         this.indexedDBListTreeElement._initialize();
         this.cacheStorageListTreeElement._initialize();
         this._initDefaultSelection();
@@ -287,15 +287,12 @@ WebInspector.ResourcesPanel.prototype = {
             this._sidebarTree.selectedTreeElement.deselect();
     },
 
-    _populateResourceTree: function()
+    /**
+     * @param {!WebInspector.ResourceTreeModel} resourceTreeModel
+     */
+    _populateResourceTree: function(resourceTreeModel)
     {
         this._treeElementForFrameId = {};
-
-        var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(this._target);
-
-        if (!resourceTreeModel)
-            return;
-
         resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.FrameAdded, this._frameAdded, this);
         resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.FrameNavigated, this._frameNavigated, this);
         resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.FrameDetached, this._frameDetached, this);
@@ -722,9 +719,12 @@ WebInspector.ResourcesPanel.prototype = {
         domStorageModel.addEventListener(WebInspector.DOMStorageModel.Events.DOMStorageRemoved, this._domStorageRemoved, this);
     },
 
-    _populateApplicationCacheTree: function()
+    /**
+     * @param {!WebInspector.ResourceTreeModel} resourceTreeModel
+     */
+    _populateApplicationCacheTree: function(resourceTreeModel)
     {
-        this._applicationCacheModel = new WebInspector.ApplicationCacheModel(this._target);
+        this._applicationCacheModel = new WebInspector.ApplicationCacheModel(this._target, resourceTreeModel);
 
         this._applicationCacheViews = {};
         this._applicationCacheFrameElements = {};