[DevTools] Clear session storage

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

Index: third_party/WebKit/Source/devtools/front_end/resources/DOMStorageModel.js
diff --git a/third_party/WebKit/Source/devtools/front_end/resources/DOMStorageModel.js b/third_party/WebKit/Source/devtools/front_end/resources/DOMStorageModel.js
index d16642321837e101a7ad688c4435dc088883985b..4cf6300dc4a8249fa889d1640da3e60ef0577629 100644
--- a/third_party/WebKit/Source/devtools/front_end/resources/DOMStorageModel.js
+++ b/third_party/WebKit/Source/devtools/front_end/resources/DOMStorageModel.js
@@ -150,6 +150,12 @@ Resources.DOMStorageModel = class extends SDK.SDKModel {
   clearForOrigin(origin) {
     if (!this._enabled)
       return;
+    for (var isLocal of [true, false]) {
+      var key = this._storageKey(origin, isLocal);
+      var storage = this._storages[key];
+      console.assert(storage);

[caseq, 2017/03/13 20:56:50]

let's drop this, NPE that would happen on next line would be as good as assert
:-)

[eostroukhov, 2017/03/13 21:33:45]

Done.

+      storage.clear();
+    }
     this._removeOrigin(origin);
     this._addOrigin(origin);
   }
@@ -165,17 +171,13 @@ Resources.DOMStorageModel = class extends SDK.SDKModel {
    * @param {string} securityOrigin
    */
   _addOrigin(securityOrigin) {
-    var localStorageKey = this._storageKey(securityOrigin, true);
-    console.assert(!this._storages[localStorageKey]);
-    var localStorage = new Resources.DOMStorage(this, securityOrigin, true);
-    this._storages[localStorageKey] = localStorage;
-    this.dispatchEventToListeners(Resources.DOMStorageModel.Events.DOMStorageAdded, localStorage);
-
-    var sessionStorageKey = this._storageKey(securityOrigin, false);
-    console.assert(!this._storages[sessionStorageKey]);
-    var sessionStorage = new Resources.DOMStorage(this, securityOrigin, false);
-    this._storages[sessionStorageKey] = sessionStorage;
-    this.dispatchEventToListeners(Resources.DOMStorageModel.Events.DOMStorageAdded, sessionStorage);
+    for (var isLocal of [true, false]) {
+      var key = this._storageKey(securityOrigin, isLocal);
+      console.assert(!this._storages[key]);
+      var storage = new Resources.DOMStorage(this, securityOrigin, isLocal);
+      this._storages[key] = storage;
+      this.dispatchEventToListeners(Resources.DOMStorageModel.Events.DOMStorageAdded, storage);
+    }
   }
 
   /**
@@ -189,17 +191,13 @@ Resources.DOMStorageModel = class extends SDK.SDKModel {
    * @param {string} securityOrigin
    */
   _removeOrigin(securityOrigin) {
-    var localStorageKey = this._storageKey(securityOrigin, true);
-    var localStorage = this._storages[localStorageKey];
-    console.assert(localStorage);
-    delete this._storages[localStorageKey];
-    this.dispatchEventToListeners(Resources.DOMStorageModel.Events.DOMStorageRemoved, localStorage);
-
-    var sessionStorageKey = this._storageKey(securityOrigin, false);
-    var sessionStorage = this._storages[sessionStorageKey];
-    console.assert(sessionStorage);
-    delete this._storages[sessionStorageKey];
-    this.dispatchEventToListeners(Resources.DOMStorageModel.Events.DOMStorageRemoved, sessionStorage);
+    for (var isLocal of [true, false]) {
+      var key = this._storageKey(securityOrigin, isLocal);
+      var storage = this._storages[key];
+      console.assert(storage);
+      delete this._storages[key];
+      this.dispatchEventToListeners(Resources.DOMStorageModel.Events.DOMStorageRemoved, storage);
+    }
   }
 
   /**