Normalizes URLs requested for favicons in the password manager dialog.

chrome/browser/resources/options2/password_manager_list.js

Index: chrome/browser/resources/options2/password_manager_list.js
diff --git a/chrome/browser/resources/options2/password_manager_list.js b/chrome/browser/resources/options2/password_manager_list.js
index acc1af2af61ac613f71ee3a905a878d0c7f10ca5..b606f3fd1cd5e95a458766e245e86e97eab3e0bf 100644
--- a/chrome/browser/resources/options2/password_manager_list.js
+++ b/chrome/browser/resources/options2/password_manager_list.js
@@ -38,7 +38,14 @@ cr.define('options.passwordManager', function() {
       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.
@@ -172,7 +179,14 @@ cr.define('options.passwordManager', function() {
       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);
     },