From d6311daea3f304f188f53dc33ccfbcbd2934c138 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Mon, 6 Jun 2016 14:36:01 -0700
Subject: [PATCH 1/2] Add failing spec for chrome.runtime.id

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

diff --git a/spec/api-browser-window-spec.js b/spec/api-browser-window-spec.js
index 8af2fb826574..11b954d2d07a 100644
--- a/spec/api-browser-window-spec.js
+++ b/spec/api-browser-window-spec.js
@@ -863,7 +863,7 @@ describe('browser-window module', function () {
           w.webContents.openDevTools({mode: 'bottom'})
 
           ipcMain.once('answer', function (event, message) {
-            assert.equal(message, 'extension loaded')
+            assert.equal(message.runtimeId, 'foo')
             done()
           })
         })
@@ -873,8 +873,8 @@ describe('browser-window module', function () {
         it('creates the extension', function (done) {
           w.webContents.openDevTools({mode: 'undocked'})
 
-          ipcMain.once('answer', function (event, message) {
-            assert.equal(message, 'extension loaded')
+          ipcMain.once('answer', function (event, message, extensionId) {
+            assert.equal(message.runtimeId, 'foo')
             done()
           })
         })
diff --git a/spec/fixtures/devtools-extensions/foo/index.html b/spec/fixtures/devtools-extensions/foo/index.html
index 4e7439422e47..1b9d1b8cb9b4 100644
--- a/spec/fixtures/devtools-extensions/foo/index.html
+++ b/spec/fixtures/devtools-extensions/foo/index.html
@@ -4,7 +4,10 @@
     <meta charset="utf-8">
     <title></title>
     <script>
-      var sendMessage = `require('electron').ipcRenderer.send('answer', 'extension loaded')`
+      var message = JSON.stringify({
+        runtimeId: chrome.runtime.id
+      })
+      var sendMessage = `require('electron').ipcRenderer.send('answer', ${message})`
       window.chrome.devtools.inspectedWindow.eval(sendMessage, function () {})
     </script>
   </head>

From 61ce19ba7e293788f9d8a393611aae3f60784714 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Mon, 6 Jun 2016 14:42:07 -0700
Subject: [PATCH 2/2] Set chrome.runtime.id

---
 lib/renderer/chrome-api.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/renderer/chrome-api.js b/lib/renderer/chrome-api.js
index 61fce14c5ba9..17c3f5bfbd1a 100644
--- a/lib/renderer/chrome-api.js
+++ b/lib/renderer/chrome-api.js
@@ -99,6 +99,8 @@ exports.injectTo = function (extensionId, isBackgroundPage, context) {
   })
 
   chrome.runtime = {
+    id: extensionId,
+
     getURL: function (path) {
       return url.format({
         protocol: 'chrome-extension',