Attempt to load component extension favicon from the resources first.

chrome/browser/extensions/image_loading_tracker_unittest.cc

Index: chrome/browser/extensions/image_loading_tracker_unittest.cc
===================================================================
--- chrome/browser/extensions/image_loading_tracker_unittest.cc	(revision 131549)
+++ chrome/browser/extensions/image_loading_tracker_unittest.cc	(working copy)
@@ -13,6 +13,7 @@
 #include "chrome/common/extensions/extension_resource.h"
 #include "content/public/browser/notification_service.h"
 #include "content/test/test_browser_thread.h"
+#include "grit/component_extension_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/image/image.h"
@@ -52,7 +53,8 @@
     return result;
   }
 
-  scoped_refptr<Extension> CreateExtension() {
+  scoped_refptr<Extension> CreateExtension(const char* name,
+      Extension::Location location) {

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

nit: Indentation.

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

Done.

     // Create and load an extension.
     FilePath test_file;
     if (!PathService::Get(chrome::DIR_TEST_DATA, &test_file)) {
@@ -60,7 +62,7 @@
       return NULL;
     }
     test_file = test_file.AppendASCII("extensions")
-                         .AppendASCII("image_loading_tracker");
+                         .AppendASCII(name);
     int error_code = 0;
     std::string error;
     JSONFileValueSerializer serializer(test_file.AppendASCII("app.json"));
@@ -75,12 +77,20 @@
     if (!valid_value.get())
       return NULL;
 
-    return Extension::Create(test_file, Extension::INVALID, *valid_value,
+    return Extension::Create(test_file, location, *valid_value,
         Extension::STRICT_ERROR_CHECKS, &error);
   }
 
   gfx::Image image_;
 
+  bool IsComponentExtensionResource(const Extension* extension,
+                                    const ExtensionResource& resource,
+                                    int& resource_id,
+                                    const ImageLoadingTracker* tracker) {
+    return
+        tracker->IsComponentExtensionResource(extension, resource, resource_id);
+  }
+
  private:
   virtual void SetUp() {
     file_thread_.Start();
@@ -97,7 +107,8 @@
 
 // Tests asking ImageLoadingTracker to cache pushes the result to the Extension.
 TEST_F(ImageLoadingTrackerTest, Cache) {
-  scoped_refptr<Extension> extension(CreateExtension());
+  scoped_refptr<Extension> extension(CreateExtension(
+      "image_loading_tracker", Extension::INVALID));
   ASSERT_TRUE(extension.get() != NULL);
 
   ExtensionResource image_resource =
@@ -146,7 +157,8 @@
 // Tests deleting an extension while waiting for the image to load doesn't cause
 // problems.
 TEST_F(ImageLoadingTrackerTest, DeleteExtensionWhileWaitingForCache) {
-  scoped_refptr<Extension> extension(CreateExtension());
+  scoped_refptr<Extension> extension(CreateExtension(
+      "image_loading_tracker", Extension::INVALID));
   ASSERT_TRUE(extension.get() != NULL);
 
   ExtensionResource image_resource =
@@ -187,7 +199,8 @@
 
 // Tests loading multiple dimensions of the same image.
 TEST_F(ImageLoadingTrackerTest, MultipleImages) {
-  scoped_refptr<Extension> extension(CreateExtension());
+  scoped_refptr<Extension> extension(CreateExtension(
+      "image_loading_tracker", Extension::INVALID));
   ASSERT_TRUE(extension.get() != NULL);
 
   std::vector<ImageLoadingTracker::ImageInfo> info_list;
@@ -221,3 +234,23 @@
   EXPECT_EQ(ExtensionIconSet::EXTENSION_ICON_BITTY, bmp1->width());
   EXPECT_EQ(ExtensionIconSet::EXTENSION_ICON_SMALLISH, bmp2->width());
 }
+
+// Tests loading multiple dimensions of the same image.
+TEST_F(ImageLoadingTrackerTest, IsComponentExtensionResource) {
+  scoped_refptr<Extension> extension(CreateExtension(
+      "file_manager", Extension::COMPONENT));
+  ASSERT_TRUE(extension.get() != NULL);
+
+  ExtensionResource resource =
+      extension->GetIconResource(ExtensionIconSet::EXTENSION_ICON_BITTY,
+                                 ExtensionIconSet::MATCH_EXACTLY);
+
+  ImageLoadingTracker loader(this);
+  int resource_id;
+  ASSERT_EQ(true,
+            IsComponentExtensionResource(extension.get(),
+                                         resource,
+                                         resource_id,
+                                         &loader));
+  ASSERT_EQ(IDR_FILE_MANAGER_ICON_16, resource_id);
+}