Normalizes URLs requested for favicons in the password manager dialog.

chrome/browser/resources/options2/password_manager_list.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.
 
 cr.define('options.passwordManager', function() {
   /** @const */ var ArrayDataModel = cr.ui.ArrayDataModel;
   /** @const */ var DeletableItemList = options.DeletableItemList;
   /** @const */ var DeletableItem = options.DeletableItem;
   /** @const */ var List = cr.ui.List;
 
@@ skipping 20 matching lines @@
     decorate: function(showPasswords) {
       DeletableItem.prototype.decorate.call(this);
 
       // The URL of the site.
       var urlLabel = this.ownerDocument.createElement('div');
       urlLabel.classList.add('favicon-cell');
       urlLabel.classList.add('weakrtl');
       urlLabel.classList.add('url');
       urlLabel.setAttribute('title', this.url);
       urlLabel.textContent = this.url;
-      urlLabel.style.backgroundImage = url('chrome://favicon/' + this.url);
+
+      // The favicon URL is prefixed with "origin/", which essentially removes
+      // the URL path past the top-level domain and ensures that a scheme (e.g.,
+      // http) is being used. This ensures that the favicon returned is the
+      // default favicon for the domain and that the URL has a scheme if none
+      // is present in the password manager.
+      urlLabel.style.backgroundImage =
+          url('chrome://favicon/origin/' + this.url);
       this.contentElement.appendChild(urlLabel);
 
       // The stored username.
       var usernameLabel = this.ownerDocument.createElement('div');
       usernameLabel.className = 'name';
       usernameLabel.textContent = this.username;
       this.contentElement.appendChild(usernameLabel);
 
       // The stored password.
       var passwordInputDiv = this.ownerDocument.createElement('div');
@@ skipping 113 matching lines @@
      */
     decorate: function() {
       DeletableItem.prototype.decorate.call(this);
 
       // The URL of the site.
       var urlLabel = this.ownerDocument.createElement('div');
       urlLabel.className = 'url';
       urlLabel.classList.add('favicon-cell');
       urlLabel.classList.add('weakrtl');
       urlLabel.textContent = this.url;
-      urlLabel.style.backgroundImage = url('chrome://favicon/' + this.url);
+
+      // The favicon URL is prefixed with "origin/", which essentially removes
+      // the URL path past the top-level domain and ensures that a scheme (e.g.,
+      // http) is being used. This ensures that the favicon returned is the
+      // default favicon for the domain and that the URL has a scheme if none
+      // is present in the password manager.
+      urlLabel.style.backgroundImage =
+          url('chrome://favicon/origin/' + this.url);
       this.contentElement.appendChild(urlLabel);
     },
 
     /**
      * Get the url for the entry.
      * @type {string}
      */
     get url() {
       return this.dataItem;
     },
@@ skipping 88 matching lines @@
     },
   };
 
   return {
     PasswordListItem: PasswordListItem,
     PasswordExceptionsListItem: PasswordExceptionsListItem,
     PasswordsList: PasswordsList,
     PasswordExceptionsList: PasswordExceptionsList,
   };
 });