Slightly nicer icon.js APIs.

chrome/browser/resources/history/history.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="../uber/uber_utils.js">
 <include src="history_focus_manager.js">
 
 ///////////////////////////////////////////////////////////////////////////////
 // Globals:
 /** @const */ var RESULTS_PER_PAGE = 150;
@@ skipping 444 matching lines @@
   if (cr.isAndroid) {
     // On Android, if a large icon is unavailable, an HTML/CSS  fallback favicon
     // is generated because Android does not yet support text drawing in native.
 
     // Check whether a fallback favicon needs to be generated.
     var desiredPixelSize = 32 * window.devicePixelRatio;
     var img = new Image();
     img.onload = this.onLargeFaviconLoadedAndroid_.bind(this, faviconDiv);
     img.src = 'chrome://large-icon/' + desiredPixelSize + '/' + this.url_;
   } else {
-    faviconDiv.style.backgroundImage = cr.icon.getFaviconImageSet(this.url_);
+    faviconDiv.style.backgroundImage = cr.icon.getFavicon(this.url_);
   }
 };
 
 /**
  * Called when the chrome://large-icon image has finished loading.
  * @param {Element} faviconDiv The DOM element to add the favicon to.
  * @param {Event} event The onload event.
  * @private
  */
 Visit.prototype.onLargeFaviconLoadedAndroid_ = function(faviconDiv, event) {
@@ skipping 1937 matching lines @@
     historyView.reload();
 }
 
 // Add handlers to HTML elements.
 document.addEventListener('DOMContentLoaded', load);
 
 // This event lets us enable and disable menu items before the menu is shown.
 document.addEventListener('canExecute', function(e) {
   e.canExecute = true;
 });