call close instead of destroy on tab remove

fix brave/browser-laptop#4699
auditors: @bbondy @jonathansampson

Author: bridiver

atom/browser/api/atom_api_web_contents.cc

@@ -2044,6 +2044,7 @@ void WebContents::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("executeScriptInTab", &WebContents::ExecuteScriptInTab)
       .SetMethod("setTabValues", &WebContents::SetTabValues)
 #endif
+      .SetMethod("close", &WebContents::CloseContents)
       .SetMethod("autofillSelect", &WebContents::AutofillSelect)
       .SetMethod("autofillPopupHidden", &WebContents::AutofillPopupHidden)
       .SetProperty("session", &WebContents::Session)

atom/common/api/resources/tabs_bindings.js

@@ -166,8 +166,12 @@ var bindings = {
 
   remove: function (tabIds, cb) {
     var responseId = ++id
-    cb && ipc.once('chrome-tabs-remove-response-' + responseId, function (evt) {
-      cb()
+    cb && ipc.once('chrome-tabs-remove-response-' + responseId, function (evt, error) {
+      if (error) {
+        lastError.run('tabs.remove', error, '', cb)
+      } else {
+        cb()
+      }
     })
     ipc.send('chrome-tabs-remove', responseId, tabIds)
   },
@@ -189,12 +193,10 @@ var bindings = {
       throw 'executeScript: must specify tab id'
     }
     cb && ipc.once('chrome-tabs-execute-script-response-' + responseId, function (evt, error, on_url, results) {
-      try {
-        if (error)
-          lastError.set('tabs.executeScript', error, null, chrome);
-        cb(results);
-      } finally {
-        lastError.clear(chrome);
+      if (error) {
+        lastError.run('tabs.executeScript', error, '', cb, results)
+      } else {
+        cb(results)
       }
     })
     ipc.send('chrome-tabs-execute-script', responseId, extensionId, tabId, details)

lib/browser/api/extensions.js

@@ -245,17 +245,16 @@ var createTab = function (createProperties, sender, responseId) {
 }
 
 var removeTabs = function (tabIds) {
-  Array(tabIds).forEach((tabId) => {
+  for (let tabId of tabIds) {
     var webContents = getWebContentsForTab(tabId)
     if (webContents) {
       if (webContents.isGuest()) {
-        webContents.destroy()
-      } else {
-        var win = BrowserWindow.fromWebContents(webContents)
-        win && win.close()
+        webContents.close(webContents)
       }
+    } else {
+      return 'No tab with id: ' + tabId
     }
-  })
+  }
 }
 
 var updateTab = function (tabId, updateProperties) {
@@ -437,8 +436,13 @@ ipcMain.on('chrome-tabs-create', function (evt, responseId, createProperties) {
 })
 
 ipcMain.on('chrome-tabs-remove', function (evt, responseId, tabIds) {
-  removeTabs(tabIds)
-  evt.sender.send('chrome-tabs-remove-' + responseId)
+  let senderTabId = evt.sender.getId()
+  tabIds = Array.isArray(tabIds) ? tabIds : [tabIds]
+  let error = removeTabs(tabIds)
+  // only send the response if the sender tab was not removed
+  if (tabIds.indexOf(senderTabId) === -1) {
+    evt.sender.send('chrome-tabs-remove-response-' + responseId, error)
+  }
 })
 
 ipcMain.on('chrome-tabs-get-current', function (evt, responseId) {

lib/renderer/web-view/web-view.js

@@ -447,7 +447,8 @@ var registerWebViewElement = function () {
     'zoomReset',
     'getZoomPercent',
     'enablePreferredSizeMode',
-    'getPreferredSize'
+    'getPreferredSize',
+    'close'
   ]
   nonblockMethods = [
     'insertCSS',