Applied the IconType.

content/browser/webui/web_ui_factory.cc

 // Copyright (c) 2011 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 "content/browser/webui/web_ui_factory.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
@@ skipping 266 matching lines @@
 // static
 void WebUIFactory::GetFaviconForURL(Profile* profile,
                                     FaviconService::GetFaviconRequest* request,
                                     const GURL& page_url) {
   // All extensions but the bookmark manager get their favicon from the icons
   // part of the manifest.
   if (page_url.SchemeIs(chrome::kExtensionScheme) &&
       page_url.host() != extension_misc::kBookmarkManagerId) {
     ExtensionWebUI::GetFaviconForURL(profile, request, page_url);
   } else {
-    scoped_refptr<RefCountedMemory> icon_data(
+    history::FaviconData favicon;
+    favicon.image_data = scoped_refptr<RefCountedMemory>(
         WebUIFactory::GetFaviconResourceBytes(profile, page_url));
-    bool know_icon = icon_data.get() != NULL && icon_data->size() > 0;
+    favicon.known_icon = favicon.image_data.get() != NULL &&
+                             favicon.image_data->size() > 0;
     request->ForwardResultAsync(
         FaviconService::FaviconDataCallback::TupleType(request->handle(),
-            know_icon, icon_data, false, GURL()));
+                                                       favicon));
   }
 }
 
 // static
 RefCountedMemory* WebUIFactory::GetFaviconResourceBytes(Profile* profile,
                                                         const GURL& page_url) {
   // The bookmark manager is a chrome extension, so we have to check for it
   // before we check for extension scheme.
   if (page_url.host() == extension_misc::kBookmarkManagerId)
     return BookmarksUI::GetFaviconResourceBytes();
@@ skipping 36 matching lines @@
   if (page_url.host() == chrome::kChromeUIPluginsHost)
     return PluginsUI::GetFaviconResourceBytes();
 
 #if defined(ENABLE_REMOTING)
   if (page_url.host() == chrome::kChromeUIRemotingHost)
     return RemotingUI::GetFaviconResourceBytes();
 #endif
 
   return NULL;
 }