[DevTools] No longer store security origins in ResourceTreeModel

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

Index: third_party/WebKit/Source/devtools/front_end/resources/ClearStorageView.js
diff --git a/third_party/WebKit/Source/devtools/front_end/resources/ClearStorageView.js b/third_party/WebKit/Source/devtools/front_end/resources/ClearStorageView.js
index e038177e518b3a1453e0ad953d7f13d1b387123a..704213bb5ad2589210343667381d739a45c1ae23 100644
--- a/third_party/WebKit/Source/devtools/front_end/resources/ClearStorageView.js
+++ b/third_party/WebKit/Source/devtools/front_end/resources/ClearStorageView.js
@@ -42,7 +42,7 @@ WebInspector.ClearStorageView = function(resourcesPanel)
     this._appendItem(caches, WebInspector.UIString("Cache storage"), "cache_storage");
     this._appendItem(caches, WebInspector.UIString("Application cache"), "appcache");
 
-    WebInspector.targetManager.observeTargets(this);
+    WebInspector.targetManager.observeTargets(this, WebInspector.Target.Capability.Browser);
     var footer = this._reportView.appendSection("", "clear-storage-button").appendRow();
     this._clearButton = createTextButton(WebInspector.UIString("Clear site data"), this._clear.bind(this), WebInspector.UIString("Clear site data"));
     footer.appendChild(this._clearButton);
@@ -70,17 +70,18 @@ WebInspector.ClearStorageView.prototype = {
         if (this._target)
             return;
         this._target = target;
-        this._updateOrigin(target.resourceTreeModel.mainFrame ? target.resourceTreeModel.mainFrame.url : "");
-        WebInspector.targetManager.addEventListener(WebInspector.TargetManager.Events.MainFrameNavigated, this._updateFrame, this);
+        var securityOriginManager = WebInspector.SecurityOriginManager.fromTarget(target);
+        this._updateOrigin(securityOriginManager.mainSecurityOrigin());
+        WebInspector.targetManager.addEventListener(WebInspector.SecurityOriginManager.EventTypes.MainSecurityOriginChanged, this._originChanged, this);

[dgozman, 2016/07/25 18:56:08]

There is no such event on TargetManager.

[eostroukhov-old, 2016/07/25 19:47:48]

Done.

     },
 
     /**
      * @param {!WebInspector.Event} event
      */
-    _updateFrame: function(event)
+    _originChanged: function(event)
     {
-        var frame = /** *@type {!WebInspector.ResourceTreeFrame} */ (event.data);
-        this._updateOrigin(frame.url);
+        var origin = /** *@type {string} */ (event.data);
+        this._updateOrigin(origin);
     },
 
     /**
@@ -131,11 +132,9 @@ WebInspector.ClearStorageView.prototype = {
 
         if (set.has(StorageAgent.StorageType.Cache_storage) || hasAll) {
             var target = WebInspector.targetManager.mainTarget();
-            if (target) {
-                var model = WebInspector.ServiceWorkerCacheModel.fromTarget(target);
-                if (model)
-                    model.clearForOrigin(this._securityOrigin);
-            }
+            var model = target && WebInspector.ServiceWorkerCacheModel.fromTarget(target);
+            if (model)
+                model.clearForOrigin(this._securityOrigin);
         }
 
         if (set.has(StorageAgent.StorageType.Appcache) || hasAll) {