Applied the IconType.

chrome/browser/ui/webui/extension_icon_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/extension_icon_source.h"
 
 #include "base/callback.h"
 #include "base/ref_counted_memory.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
@@ skipping 182 matching lines @@
   FaviconService* favicon_service =
       profile_->GetFaviconService(Profile::EXPLICIT_ACCESS);
   // Fall back to the default icons if the service isn't available.
   if (favicon_service == NULL) {
     LoadDefaultImage(request_id);
     return;
   }
 
   GURL favicon_url = GetData(request_id)->extension->GetFullLaunchURL();
   FaviconService::Handle handle = favicon_service->GetFaviconForURL(
-      favicon_url, &cancelable_consumer_,
+      favicon_url,
+      history::FAV_ICON,
+      &cancelable_consumer_,
       NewCallback(this, &ExtensionIconSource::OnFaviconDataAvailable));
   cancelable_consumer_.SetClientData(favicon_service, handle, request_id);
 }
 
 void ExtensionIconSource::OnFaviconDataAvailable(
     FaviconService::Handle request_handle,
-    bool know_favicon,
-    scoped_refptr<RefCountedMemory> data,
-    bool expired,
-    GURL icon_url) {
+    FaviconService::FaviconData favicon) {
   int request_id = cancelable_consumer_.GetClientData(
       profile_->GetFaviconService(Profile::EXPLICIT_ACCESS), request_handle);
   ExtensionIconRequest* request = GetData(request_id);
 
   // Fallback to the default icon if there wasn't a favicon.
-  if (!know_favicon || !data.get() || !data->size()) {
+  if (!favicon.known_icon || !favicon.image_data.get() ||
+      !favicon.image_data->size()) {

[sky, 2011/03/10 17:54:44]

This code is in nearly every callback. Create a method in FaviconData, say
is_valid, that does this.

[michaelbai, 2011/03/11 01:11:28]

Done.

     LoadDefaultImage(request_id);
     return;
   }
 
   if (!request->grayscale) {
     // If we don't need a grayscale image, then we can bypass FinalizeImage
     // to avoid unnecessary conversions.
     ClearData(request_id);
-    SendResponse(request_id, data);
+    SendResponse(request_id, favicon.image_data);
   } else {
-    FinalizeImage(ToBitmap(data->front(), data->size()), request_id);
+    FinalizeImage(ToBitmap(favicon.image_data->front(),
+                           favicon.image_data->size()), request_id);
   }
 }
 
 void ExtensionIconSource::OnImageLoaded(SkBitmap* image,
                                         ExtensionResource resource,
                                         int index) {
   int request_id = tracker_map_[index];
   tracker_map_.erase(tracker_map_.find(index));
   FinalizeImage(image, request_id);
 }
@@ skipping 68 matching lines @@
 
 void ExtensionIconSource::ClearData(int request_id) {
   std::map<int, ExtensionIconRequest*>::iterator i =
       request_map_.find(request_id);
   if (i == request_map_.end())
     return;
 
   delete i->second;
   request_map_.erase(i);
 }