Applied the IconType.

chrome/browser/ui/webui/favicon_source.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 "chrome/browser/ui/webui/favicon_source.h"
 
 #include "base/callback.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
 #include "grit/app_resources.h"
@@ skipping 15 matching lines @@
   if (favicon_service) {
     FaviconService::Handle handle;
     if (path.empty()) {
       SendDefaultResponse(request_id);
       return;
     }
 
     if (path.size() > 8 && path.substr(0, 8) == "iconurl/") {
       handle = favicon_service->GetFavicon(
           GURL(path.substr(8)),
+          history::FAVICON,
           &cancelable_consumer_,
           NewCallback(this, &FaviconSource::OnFaviconDataAvailable));
     } else {
       handle = favicon_service->GetFaviconForURL(
           GURL(path),
+          history::FAVICON,
           &cancelable_consumer_,
           NewCallback(this, &FaviconSource::OnFaviconDataAvailable));
     }
     // Attach the ChromeURLDataManager request ID to the history request.
     cancelable_consumer_.SetClientData(favicon_service, handle, request_id);
   } else {
     SendResponse(request_id, NULL);
   }
 }
 
 std::string FaviconSource::GetMimeType(const std::string&) const {
   // We need to explicitly return a mime type, otherwise if the user tries to
   // drag the image they get no extension.
   return "image/png";
 }
 
 bool FaviconSource::ShouldReplaceExistingSource() const {
   // Leave the existing DataSource in place, otherwise we'll drop any pending
   // requests on the floor.
   return false;
 }
 
 void FaviconSource::OnFaviconDataAvailable(
     FaviconService::Handle request_handle,
-    bool know_favicon,
-    scoped_refptr<RefCountedMemory> data,
-    bool expired,
-    GURL icon_url) {
+    history::FaviconData favicon) {
   FaviconService* favicon_service =
       profile_->GetFaviconService(Profile::EXPLICIT_ACCESS);
   int request_id = cancelable_consumer_.GetClientData(favicon_service,
                                                       request_handle);
 
-  if (know_favicon && data.get() && data->size()) {
+  if (favicon.is_valid()) {
     // Forward the data along to the networking system.
-    SendResponse(request_id, data);
+    SendResponse(request_id, favicon.image_data);
   } else {
     SendDefaultResponse(request_id);
   }
 }
 
 void FaviconSource::SendDefaultResponse(int request_id) {
   if (!default_favicon_.get()) {
     default_favicon_ =
         ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
             IDR_DEFAULT_FAVICON);
   }
 
   SendResponse(request_id, default_favicon_);
 }