Site Settings Desktop: Fix bug with deleting manually added exceptions.

chrome/browser/resources/settings/site_settings/site_list.js

 // Copyright 2015 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.
 
 /**
  * @fileoverview
  * 'site-list' shows a list of Allowed and Blocked sites for a given
  * category.
  */
 Polymer({
@@ skipping 331 matching lines @@
       return comparison;
     });
     var results = [];
     var lastOrigin = '';
     var lastEmbeddingOrigin = '';
     for (var i = 0; i < sites.length; ++i) {
       var origin = sites[i].origin;
       var originForDisplay = this.sanitizePort(origin.replace('[*.]', ''));
 
       var embeddingOrigin = sites[i].embeddingOrigin;
-      if (this.category == settings.ContentSettingsTypes.GEOLOCATION) {
-        if (embeddingOrigin == '')
-          embeddingOrigin = '*';
-      }
       var embeddingOriginForDisplay = '';
-      if (embeddingOrigin != '' && origin != embeddingOrigin) {
-        embeddingOriginForDisplay = loadTimeData.getStringF(
-            'embeddedOnHost', this.sanitizePort(embeddingOrigin));
+      if (origin != embeddingOrigin) {
+        embeddingOriginForDisplay =
+            this.getEmbedderString(embeddingOrigin, this.category);
       }
 
       // The All Sites category can contain duplicates (from other categories).
       if (originForDisplay == lastOrigin &&
           embeddingOriginForDisplay == lastEmbeddingOrigin) {
         continue;
       }
 
       results.push({
          origin: origin,
@@ skipping 106 matching lines @@
     // is redundant to also list all the sites that are blocked.
     if (this.isAllowList_())
       return true;
 
     if (this.isSessionOnlyList_())
       return siteList.length > 0;
 
     return toggleState;
   },
 });