WebUI: Fix favicon URL regression.

ui/webui/resources/js/util.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.
 
 // <include src="assert.js">
 
 /**
  * Alias for document.getElementById. Found elements must be HTMLElements.
  * @param {string} id The ID of the element to find.
  * @return {HTMLElement} The found element or null if not found.
@@ skipping 327 matching lines @@
  *     itself.
  * @param {number=} opt_size Optional preferred size of the favicon.
  * @param {string=} opt_type Optional type of favicon to request. Valid values
  *     are 'favicon' and 'touch-icon'. Default is 'favicon'.
  * @return {string} -webkit-image-set for the favicon.
  */
 function getFaviconImageSet(url, opt_size, opt_type) {
   var size = opt_size || 16;
   var type = opt_type || 'favicon';
 
-  // Note: Literals 'iconurl' and 'origin' must match |kIconURLParameter| and
-  // |kOriginParameter| in components/favicon_base/favicon_url_parser.cc.
-  var urlType = FAVICON_URL_REGEX.test(url) ? 'iconurl' : 'origin';
-
   return imageset(
       'chrome://' + type + '/size/' + size + '@scalefactorx/' +
-      urlType + '/' + url);
+      // Note: Literal 'iconurl' must match |kIconURLParameter| in
+      // components/favicon_base/favicon_url_parser.cc.
+      (FAVICON_URL_REGEX.test(url) ? 'iconurl/' : '') + url);
 }
 
 /**
  * Creates an element of a specified type with a specified class name.
  * @param {string} type The node type.
  * @param {string} className The class name to use.
  * @return {Element} The created element.
  */
 function createElementWithClassName(type, className) {
   var elm = document.createElement(type);
@@ skipping 99 matching lines @@
 }
 
 /**
  * Quote a string so it can be used in a regular expression.
  * @param {string} str The source string.
  * @return {string} The escaped string.
  */
 function quoteString(str) {
   return str.replace(/([\\\.\+\*\?\[\^\]\$\(\)\{\}\=\!\<\>\|\:])/g, '\\$1');
 }