From 2fe83bc5f0c2ebe0c12ecb07ec5c5f9f5fc637b9 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 28 Jun 2016 13:01:51 -0700
Subject: [PATCH 1/2] Add failing spec for no specified storage keys

---
 spec/api-browser-window-spec.js                  |  7 +++++--
 spec/fixtures/devtools-extensions/foo/index.html | 15 ++++++++++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/spec/api-browser-window-spec.js b/spec/api-browser-window-spec.js
index 25b852946ff..b7b647e1c4e 100644
--- a/spec/api-browser-window-spec.js
+++ b/spec/api-browser-window-spec.js
@@ -1025,7 +1025,7 @@ describe('browser-window module', function () {
         }, /Unexpected token }/)
       })
 
-      describe('when the devtools is docked', function () {
+      describe.only('when the devtools is docked', function () {
         it('creates the extension', function (done) {
           w.webContents.openDevTools({mode: 'bottom'})
 
@@ -1033,7 +1033,10 @@ describe('browser-window module', function () {
             assert.equal(message.runtimeId, 'foo')
             assert.equal(message.tabId, w.webContents.id)
             assert.equal(message.i18nString, 'foo - bar (baz)')
-            assert.deepEqual(message.storageItems, {foo: 'bar'})
+            assert.deepEqual(message.storageItems, {
+              local: {hello: 'world'},
+              sync: {foo: 'bar'}
+            })
             done()
           })
         })
diff --git a/spec/fixtures/devtools-extensions/foo/index.html b/spec/fixtures/devtools-extensions/foo/index.html
index b10288227ac..70db43a37c2 100644
--- a/spec/fixtures/devtools-extensions/foo/index.html
+++ b/spec/fixtures/devtools-extensions/foo/index.html
@@ -6,16 +6,25 @@
     <script>
       function testStorage (callback) {
         chrome.storage.sync.set({foo: 'bar'}, function () {
-          chrome.storage.sync.get({foo: 'baz'}, callback)
+          chrome.storage.sync.get({foo: 'baz'}, function (syncItems) {
+            chrome.storage.local.set({hello: 'world'}, function () {
+              chrome.storage.local.get(null, function(localItems) {
+                callback(syncItems, localItems)
+              })
+            })
+          })
         })
       }
 
-      testStorage(function (items) {
+      testStorage(function (syncItems, localItems) {
         var message = JSON.stringify({
           runtimeId: chrome.runtime.id,
           tabId: chrome.devtools.inspectedWindow.tabId,
           i18nString: chrome.i18n.getMessage('foo', ['bar', 'baz']),
-          storageItems: items
+          storageItems: {
+            local: localItems,
+            sync: syncItems
+          }
         })
         var sendMessage = `require('electron').ipcRenderer.send('answer', ${message})`
         window.chrome.devtools.inspectedWindow.eval(sendMessage, function () {})

From d2d11ce8bd3b42ab8d528548d3ece2a545b14f7c Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 28 Jun 2016 13:02:03 -0700
Subject: [PATCH 2/2] Invoke callback instead of returning

---
 lib/renderer/extensions/storage.js | 15 +++++++++------
 spec/api-browser-window-spec.js    |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/lib/renderer/extensions/storage.js b/lib/renderer/extensions/storage.js
index b0941d98c8c..af3978e6484 100644
--- a/lib/renderer/extensions/storage.js
+++ b/lib/renderer/extensions/storage.js
@@ -12,11 +12,17 @@ const setStorage = (storageType, storage) => {
   window.localStorage.setItem(`__chrome.storage.${storageType}__`, json)
 }
 
+const scheduleCallback = (items, callback) => {
+  setTimeout(function () {
+    callback(items)
+  })
+}
+
 const getStorageManager = (storageType) => {
   return {
     get (keys, callback) {
       const storage = getStorage(storageType)
-      if (keys == null) return storage
+      if (keys == null) return scheduleCallback(storage, callback)
 
       let defaults = {}
       switch (typeof keys) {
@@ -30,7 +36,7 @@ const getStorageManager = (storageType) => {
           }
           break
       }
-      if (keys.length === 0) return {}
+      if (keys.length === 0) return scheduleCallback({}, callback)
 
       let items = {}
       keys.forEach(function (key) {
@@ -38,10 +44,7 @@ const getStorageManager = (storageType) => {
         if (value == null) value = defaults[key]
         items[key] = value
       })
-
-      setTimeout(function () {
-        callback(items)
-      })
+      scheduleCallback(items, callback)
     },
 
     set (items, callback) {
diff --git a/spec/api-browser-window-spec.js b/spec/api-browser-window-spec.js
index b7b647e1c4e..ea82d59f296 100644
--- a/spec/api-browser-window-spec.js
+++ b/spec/api-browser-window-spec.js
@@ -1025,7 +1025,7 @@ describe('browser-window module', function () {
         }, /Unexpected token }/)
       })
 
-      describe.only('when the devtools is docked', function () {
+      describe('when the devtools is docked', function () {
         it('creates the extension', function (done) {
           w.webContents.openDevTools({mode: 'bottom'})