Merge branch 'master' into chrome-storage-sync

spec/fixtures/devtools-extensions/foo/_locales/en/messages.json

@@ -0,0 +1,10 @@
+{
+  "foo": {
+    "message": "foo - $BAZ$ ($2)",
+    "placeholders": {
+      "baz": {
+        "content": "$1"
+      }
+    }
+  }
+}

spec/fixtures/devtools-extensions/foo/index.html

@@ -13,6 +13,8 @@
       testStorage(function (items) {
         var message = JSON.stringify({
           runtimeId: chrome.runtime.id,
+          tabId: chrome.devtools.inspectedWindow.tabId,
+          i18nString: chrome.i18n.getMessage('foo', ['bar', 'baz']),
           storageItems: items
         })
         var sendMessage = `require('electron').ipcRenderer.send('answer', ${message})`

spec/fixtures/devtools-extensions/foo/manifest.json

@@ -1,5 +1,6 @@
 {
   "name": "foo",
   "version": "1.0",
-  "devtools_page": "foo.html"
+  "devtools_page": "foo.html",
+  "default_locale": "en"
 }