From b86dff45d77d3019222912753423b7d913bb6905 Mon Sep 17 00:00:00 2001
From: Jhen <developer@jhen.me>
Date: Thu, 10 Nov 2016 11:34:46 +0800
Subject: [PATCH 1/2] Add support remove / clear for chrome.storage

---
 lib/renderer/extensions/storage.js | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/lib/renderer/extensions/storage.js b/lib/renderer/extensions/storage.js
index af3978e64846..d1a8d880a60b 100644
--- a/lib/renderer/extensions/storage.js
+++ b/lib/renderer/extensions/storage.js
@@ -56,6 +56,27 @@ const getStorageManager = (storageType) => {
 
       setStorage(storageType, storage)
 
+      setTimeout(callback)
+    },
+
+    remove (keys, callback) {
+      const storage = getStorage(storageType)
+
+      if (!Array.isArray(keys)) {
+        keys = [keys]
+      }
+      keys.forEach(function (key) {
+        delete storage[key]
+      })
+
+      setStorage(storageType, storage)
+
+      setTimeout(callback)
+    },
+
+    clear (callback) {
+      setStorage(storageType, {})
+
       setTimeout(callback)
     }
   }

From 8b30439d7f91416f46e5c84049457dca7bf9cb1c Mon Sep 17 00:00:00 2001
From: Jhen <developer@jhen.me>
Date: Tue, 15 Nov 2016 19:41:23 +0800
Subject: [PATCH 2/2] Update devtools extension spec for chrome.storage

---
 spec/api-browser-window-spec.js               | 12 +++-
 .../devtools-extensions/foo/index.html        | 64 +++++++++++++++++--
 2 files changed, 67 insertions(+), 9 deletions(-)

diff --git a/spec/api-browser-window-spec.js b/spec/api-browser-window-spec.js
index 9bfede278bc2..eb69be342b75 100644
--- a/spec/api-browser-window-spec.js
+++ b/spec/api-browser-window-spec.js
@@ -1384,8 +1384,16 @@ describe('browser-window module', function () {
             assert.equal(message.tabId, w.webContents.id)
             assert.equal(message.i18nString, 'foo - bar (baz)')
             assert.deepEqual(message.storageItems, {
-              local: {hello: 'world'},
-              sync: {foo: 'bar'}
+              local: {
+                set: {hello: 'world', world: 'hello'},
+                remove: {world: 'hello'},
+                clear: {}
+              },
+              sync: {
+                set: {foo: 'bar', bar: 'foo'},
+                remove: {foo: 'bar'},
+                clear: {}
+              }
             })
             done()
           })
diff --git a/spec/fixtures/devtools-extensions/foo/index.html b/spec/fixtures/devtools-extensions/foo/index.html
index 55d4664cc87d..92c20145588b 100644
--- a/spec/fixtures/devtools-extensions/foo/index.html
+++ b/spec/fixtures/devtools-extensions/foo/index.html
@@ -4,10 +4,10 @@
     <meta charset="utf-8">
     <title></title>
     <script>
-      function testStorage (callback) {
-        chrome.storage.sync.set({foo: 'bar'}, function () {
-          chrome.storage.sync.get({foo: 'baz'}, function (syncItems) {
-            chrome.storage.local.set({hello: 'world'}, function () {
+      function testStorageClear (callback) {
+        chrome.storage.sync.clear(function () {
+          chrome.storage.sync.get(null, function (syncItems) {
+            chrome.storage.local.clear(function () {
               chrome.storage.local.get(null, function(localItems) {
                 callback(syncItems, localItems)
               })
@@ -16,6 +16,44 @@
         })
       }
 
+      function testStorageRemove (callback) {
+        chrome.storage.sync.remove('bar', function () {
+          chrome.storage.sync.get({foo: 'baz'}, function (syncItems) {
+            chrome.storage.local.remove(['hello'], function () {
+              chrome.storage.local.get(null, function(localItems) {
+                callback(syncItems, localItems)
+              })
+            })
+          })
+        })
+      }
+
+      function testStorageSet (callback) {
+        chrome.storage.sync.set({foo: 'bar', bar: 'foo'}, function () {
+          chrome.storage.sync.get({foo: 'baz', bar: 'fooo'}, function (syncItems) {
+            chrome.storage.local.set({hello: 'world', world: 'hello'}, function () {
+              chrome.storage.local.get(null, function(localItems) {
+                callback(syncItems, localItems)
+              })
+            })
+          })
+        })
+      }
+
+      function testStorage (callback) {
+        testStorageSet(function (syncForSet, localForSet) {
+          testStorageRemove(function (syncForRemove, localForRemove) {
+            testStorageClear(function (syncForClear, localForClear) {
+              callback(
+                syncForSet, localForSet,
+                syncForRemove, localForRemove,
+                syncForClear, localForClear
+              )
+            })
+          })
+        })
+      }
+
       function reportCoverage () {
         var message = JSON.stringify({
           pid: chrome.runtime.id,
@@ -25,14 +63,26 @@
         window.chrome.devtools.inspectedWindow.eval(coverageMessage, function () {})
       }
 
-      testStorage(function (syncItems, localItems) {
+      testStorage(function (
+        syncForSet, localForSet,
+        syncForRemove, localForRemove,
+        syncForClear, localForClear
+      ) {
         var message = JSON.stringify({
           runtimeId: chrome.runtime.id,
           tabId: chrome.devtools.inspectedWindow.tabId,
           i18nString: chrome.i18n.getMessage('foo', ['bar', 'baz']),
           storageItems: {
-            local: localItems,
-            sync: syncItems
+            local: {
+              set: localForSet,
+              remove: localForRemove,
+              clear: localForClear
+            },
+            sync: {
+              set: syncForSet,
+              remove: syncForRemove,
+              clear: syncForClear
+            }
           }
         })