Attempt to load component extension favicon from the resources first.

chrome/browser/extensions/image_loading_tracker.h

Index: chrome/browser/extensions/image_loading_tracker.h
===================================================================
--- chrome/browser/extensions/image_loading_tracker.h	(revision 131549)
+++ chrome/browser/extensions/image_loading_tracker.h	(working copy)
@@ -122,6 +122,13 @@
   void OnImageLoaded(SkBitmap* image, const ExtensionResource& resource,
                      const gfx::Size& original_size, int id, bool should_cache);
 
+  // Checks whether image is a component extension resource. Returns false
+  // if a given |resource| does not have a corresponding image in bundled
+  // resources. Otherwise fills |resource_id|.
+  bool IsComponentExtensionResource(const Extension* extension,
+                                    const ExtensionResource& resource,
+                                    int& resource_id) const;
+
   // content::NotificationObserver method. If an extension is uninstalled while
   // we're waiting for the image we remove the entry from load_map_.
   virtual void Observe(int type,
@@ -143,6 +150,8 @@
 
   content::NotificationRegistrar registrar_;
 
+  friend class ImageLoadingTrackerTest;

[Finnur, 2012/04/11 17:38:13]

FRIEND_TEST_ALL_PREFIXES instead?

[dgozman, 2012/04/12 11:47:24]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(ImageLoadingTracker);
 };