Unify shared and service workers in chrome://inspect, remove service workers iframe.

chrome/browser/resources/inspect/inspect.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 var MIN_VERSION_TAB_CLOSE = 25;
 var MIN_VERSION_TARGET_ID = 26;
 var MIN_VERSION_NEW_TAB = 29;
 var MIN_VERSION_TAB_ACTIVATE = 30;
 
 var queryParamsObject = {};
@@ skipping 11 matching lines @@
 })();
 
 function sendCommand(command, args) {
   chrome.send(command, Array.prototype.slice.call(arguments, 1));
 }
 
 function sendTargetCommand(command, target) {
   sendCommand(command, target.source, target.id);
 }
 
-function sendServiceWorkerCommand(action, worker) {
-  $('serviceworker-internals').contentWindow.postMessage({
-    'action': action,
-    'worker': worker
-  },'chrome://serviceworker-internals');
-}
-
 function removeChildren(element_id) {
   var element = $(element_id);
   element.textContent = '';
 }
 
 function onload() {
   var tabContents = document.querySelectorAll('#content > div');
   for (var i = 0; i != tabContents.length; i++) {
     var tabContent = tabContents[i];
     var tabName = tabContent.querySelector('.content-header').textContent;
 
     var tabHeader = document.createElement('div');
     tabHeader.className = 'tab-header';
     var button = document.createElement('button');
     button.textContent = tabName;
     tabHeader.appendChild(button);
     tabHeader.addEventListener('click', selectTab.bind(null, tabContent.id));
     $('navigation').appendChild(tabHeader);
   }
   onHashChange();
   initSettings();
   sendCommand('init-ui');
-  window.addEventListener('message', onMessage.bind(this), false);
-}
-
-function onMessage(event) {
-  if (event.origin != 'chrome://serviceworker-internals') {
-    return;
-  }
-  populateServiceWorkers(event.data.partition_id,
-                         event.data.workers);
 }
 
 function onHashChange() {
   var hash = window.location.hash.slice(1).toLowerCase();
   if (!selectTab(hash))
     selectTab('devices');
 }
 
 /**
  * @param {string} id Tab id.
@@ skipping 16 matching lines @@
       tabContent.classList.remove('selected');
       tabHeader.classList.remove('selected');
     }
   }
   if (!found)
     return false;
   window.location.hash = id;
   return true;
 }
 
-function populateServiceWorkers(partition_id, workers) {
-  var list = $('service-workers-list-' + partition_id);
-  if (workers.length == 0) {
-    if (list) {
-        list.parentNode.removeChild(list);
-    }
-    return;
-  }
-  if (list) {
-    list.textContent = '';
-  } else {
-    list = document.createElement('div');
-    list.id = 'service-workers-list-' + partition_id;
-    list.className = 'list';
-    $('service-workers-list').appendChild(list);
-  }
-  for (var i = 0; i < workers.length; i++) {
-    var worker = workers[i];
-    worker.hasCustomInspectAction = true;
-    var row = addTargetToList(worker, list, ['scope', 'url']);
-    addActionLink(
-        row,
-        'inspect',
-        sendServiceWorkerCommand.bind(null, 'inspect', worker),
-        false);
-    addActionLink(
-        row,
-        'terminate',
-        sendServiceWorkerCommand.bind(null, 'stop', worker),
-        false);
-  }
-}
-
 function populateTargets(source, data) {
   if (source == 'local')
     populateLocalTargets(data);
   else if (source == 'remote')
     populateRemoteTargets(data);
   else
     console.error('Unknown source type: ' + source);
 }
 
 function populateLocalTargets(data) {
   removeChildren('pages-list');
   removeChildren('extensions-list');
   removeChildren('apps-list');
   removeChildren('others-list');
   removeChildren('workers-list');
+  removeChildren('service-workers-list');
 
-  for (var i = 0; i < data.length; i++) {
+    for (var i = 0; i < data.length; i++) {
     if (data[i].type === 'page')
       addToPagesList(data[i]);
     else if (data[i].type === 'background_page')
       addToExtensionsList(data[i]);
     else if (data[i].type === 'app')
       addToAppsList(data[i]);
     else if (data[i].type === 'worker')
       addToWorkersList(data[i]);
+    else if (data[i].type === 'service_worker')
+      addToServiceWorkersList(data[i]);
     else
       addToOthersList(data[i]);
   }
 }
 
 function showIncognitoWarning() {
   $('devices-incognito').hidden = false;
 }
 
 function populateRemoteTargets(devices) {
@@ skipping 241 matching lines @@
   });
 }
 
 function addToWorkersList(data) {
   var row =
       addTargetToList(data, $('workers-list'), ['name', 'description', 'url']);
   addActionLink(row, 'terminate',
       sendTargetCommand.bind(null, 'close', data), false);
 }
 
+function addToServiceWorkersList(data) {
+    var row = addTargetToList(
+        data, $('service-workers-list'), ['name', 'description', 'url']);
+    addActionLink(row, 'terminate',
+        sendTargetCommand.bind(null, 'close', data), false);
+}
+
 function addToOthersList(data) {
   addTargetToList(data, $('others-list'), ['url']);
 }
 
 function formatValue(data, property) {
   var value = data[property];
 
   if (property == 'name' && value == '') {
     value = 'untitled';
   }
@@ skipping 498 matching lines @@
     deviceSection.querySelector('.device-ports').textContent = '';
   }
 
   Array.prototype.forEach.call(
       document.querySelectorAll('.device'), clearPorts);
 }
 
 document.addEventListener('DOMContentLoaded', onload);
 
 window.addEventListener('hashchange', onHashChange);