Add a class to replace ImageLoadingTracker with a nicer API.

chrome/browser/extensions/image_utils_unittest.cc

Index: chrome/browser/extensions/image_utils_unittest.cc
diff --git a/chrome/browser/extensions/image_loading_tracker_unittest.cc b/chrome/browser/extensions/image_utils_unittest.cc
similarity index 68%
copy from chrome/browser/extensions/image_loading_tracker_unittest.cc
copy to chrome/browser/extensions/image_utils_unittest.cc
index c37cba95c03d8f8f593025ab497ae484f1d51763..e82045d5e64455e664efc1594f678cd03a81f97b 100644
--- a/chrome/browser/extensions/image_loading_tracker_unittest.cc
+++ b/chrome/browser/extensions/image_utils_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/extensions/image_loading_tracker.h"
+#include "chrome/browser/extensions/image_utils.h"
 
 #include "base/json/json_file_value_serializer.h"
 #include "base/message_loop.h"
@@ -25,10 +25,11 @@
 using content::BrowserThread;
 using extensions::Extension;
 
-class ImageLoadingTrackerTest : public testing::Test,
-                                public ImageLoadingTracker::Observer {
+namespace image_utils = extension_image_utils;
+
+class ImageUtilsTest : public testing::Test {
  public:
-  ImageLoadingTrackerTest()
+  ImageUtilsTest()
       : image_loaded_count_(0),
         quit_in_image_loaded_(false),
         ui_thread_(BrowserThread::UI, &ui_loop_),
@@ -36,9 +37,7 @@ class ImageLoadingTrackerTest : public testing::Test,
         io_thread_(BrowserThread::IO) {
   }
 
-  virtual void OnImageLoaded(const gfx::Image& image,
-                             const std::string& extension_id,
-                             int index) OVERRIDE {
+  void OnImageLoaded(const gfx::Image& image) {
     image_loaded_count_++;
     if (quit_in_image_loaded_)
       MessageLoop::current()->Quit();
@@ -101,8 +100,15 @@ class ImageLoadingTrackerTest : public testing::Test,
   content::TestBrowserThread io_thread_;
 };
 
-// Tests asking ImageLoadingTracker to cache pushes the result to the Extension.
-TEST_F(ImageLoadingTrackerTest, Cache) {
+
+namespace {
+
+
+};

[Finnur, 2012/10/05 14:41:33]

You writing code in invisible ink now? :)

[Marijn Kruisselbrink, 2012/10/05 18:00:08]

Done.

+
+// Tests asking extension_image_utils to cache pushes the result to the
+// Extension.
+TEST_F(ImageUtilsTest, LoadImageAsync) {
   scoped_refptr<Extension> extension(CreateExtension(
       "image_loading_tracker", Extension::INVALID));
   ASSERT_TRUE(extension.get() != NULL);
@@ -112,11 +118,11 @@ TEST_F(ImageLoadingTrackerTest, Cache) {
                                  ExtensionIconSet::MATCH_EXACTLY);
   gfx::Size max_size(extension_misc::EXTENSION_ICON_SMALLISH,
                      extension_misc::EXTENSION_ICON_SMALLISH);
-  ImageLoadingTracker loader(this);
-  loader.LoadImage(extension.get(),
-                   image_resource,
-                   max_size,
-                   ImageLoadingTracker::CACHE);
+
+  image_utils::LoadImageAsync(extension.get(), image_resource,
+                              max_size,
+                              base::Bind(&ImageUtilsTest::OnImageLoaded,
+                                         base::Unretained(this)));
 
   // The image isn't cached, so we should not have received notification.
   EXPECT_EQ(0, image_loaded_count());
@@ -129,30 +135,11 @@ TEST_F(ImageLoadingTrackerTest, Cache) {
   // Check that the image was loaded.
   EXPECT_EQ(extension_misc::EXTENSION_ICON_SMALLISH,
             image_.ToSkBitmap()->width());
-
-  // The image should be cached in the Extension.
-  EXPECT_TRUE(extension->HasCachedImage(image_resource, max_size));
-
-  // Make sure the image is in the extension.
-  EXPECT_EQ(extension_misc::EXTENSION_ICON_SMALLISH,
-            extension->GetCachedImage(image_resource, max_size).width());
-
-  // Ask the tracker for the image again, this should call us back immediately.
-  loader.LoadImage(extension.get(),
-                   image_resource,
-                   max_size,
-                   ImageLoadingTracker::CACHE);
-  // We should have gotten the image.
-  EXPECT_EQ(1, image_loaded_count());

[Finnur, 2012/10/05 14:41:33]

Why remove this?

[Marijn Kruisselbrink, 2012/10/05 18:00:08]

Because at the moment extension_image_utils doesn't do anything with the cache
(it not only doesn't save things in it, it also doesn't check if images already
are pre-cached). If it is desirable to always check if an image is in this cache
already, I could re-add this part of the test.

-
-  // Check that the image was loaded.
-  EXPECT_EQ(extension_misc::EXTENSION_ICON_SMALLISH,
-            image_.ToSkBitmap()->width());
 }
 
 // Tests deleting an extension while waiting for the image to load doesn't cause
 // problems.
-TEST_F(ImageLoadingTrackerTest, DeleteExtensionWhileWaitingForCache) {
+TEST_F(ImageUtilsTest, DeleteExtensionWhileWaitingForCache) {
   scoped_refptr<Extension> extension(CreateExtension(
       "image_loading_tracker", Extension::INVALID));
   ASSERT_TRUE(extension.get() != NULL);
@@ -160,12 +147,11 @@ TEST_F(ImageLoadingTrackerTest, DeleteExtensionWhileWaitingForCache) {
   ExtensionResource image_resource =
       extension->GetIconResource(extension_misc::EXTENSION_ICON_SMALLISH,
                                  ExtensionIconSet::MATCH_EXACTLY);
-  ImageLoadingTracker loader(this);
-  loader.LoadImage(extension.get(),
-                   image_resource,
-                   gfx::Size(extension_misc::EXTENSION_ICON_SMALLISH,
-                             extension_misc::EXTENSION_ICON_SMALLISH),
-                   ImageLoadingTracker::CACHE);
+  gfx::Size max_size(extension_misc::EXTENSION_ICON_SMALLISH,
+                     extension_misc::EXTENSION_ICON_SMALLISH);
+  image_utils::LoadImageAsync(extension.get(), image_resource, max_size,
+                              base::Bind(&ImageUtilsTest::OnImageLoaded,
+                                         base::Unretained(this)));
 
   // The image isn't cached, so we should not have received notification.
   EXPECT_EQ(0, image_loaded_count());
@@ -194,26 +180,27 @@ TEST_F(ImageLoadingTrackerTest, DeleteExtensionWhileWaitingForCache) {
 }
 
 // Tests loading multiple dimensions of the same image.
-TEST_F(ImageLoadingTrackerTest, MultipleImages) {
+TEST_F(ImageUtilsTest, MultipleImages) {
   scoped_refptr<Extension> extension(CreateExtension(
       "image_loading_tracker", Extension::INVALID));
   ASSERT_TRUE(extension.get() != NULL);
 
-  std::vector<ImageLoadingTracker::ImageRepresentation> info_list;
+  std::vector<image_utils::ImageRepresentation> info_list;
   int sizes[] = {extension_misc::EXTENSION_ICON_SMALLISH,
                  extension_misc::EXTENSION_ICON_BITTY};
   for (size_t i = 0; i < arraysize(sizes); ++i) {
     ExtensionResource resource =
         extension->GetIconResource(sizes[i], ExtensionIconSet::MATCH_EXACTLY);
-    info_list.push_back(ImageLoadingTracker::ImageRepresentation(
+    info_list.push_back(image_utils::ImageRepresentation(
         resource,
-        ImageLoadingTracker::ImageRepresentation::RESIZE_WHEN_LARGER,
+        image_utils::ImageRepresentation::RESIZE_WHEN_LARGER,
         gfx::Size(sizes[i], sizes[i]),
         ui::SCALE_FACTOR_NONE));
   }
 
-  ImageLoadingTracker loader(this);
-  loader.LoadImages(extension.get(), info_list, ImageLoadingTracker::CACHE);
+  image_utils::LoadImagesAsync(extension.get(), info_list,
+                               base::Bind(&ImageUtilsTest::OnImageLoaded,
+                                          base::Unretained(this)));
 
   // The image isn't cached, so we should not have received notification.
   EXPECT_EQ(0, image_loaded_count());
@@ -237,24 +224,3 @@ TEST_F(ImageLoadingTrackerTest, MultipleImages) {
   EXPECT_EQ(extension_misc::EXTENSION_ICON_SMALLISH,
             img_rep2->pixel_width());
 }
-
-// Tests IsComponentExtensionResource function.
-TEST_F(ImageLoadingTrackerTest, IsComponentExtensionResource) {
-  scoped_refptr<Extension> extension(CreateExtension(
-      "file_manager", Extension::COMPONENT));
-  ASSERT_TRUE(extension.get() != NULL);
-
-  ExtensionResource resource =
-      extension->GetIconResource(extension_misc::EXTENSION_ICON_BITTY,
-                                 ExtensionIconSet::MATCH_EXACTLY);
-
-#if defined(FILE_MANAGER_EXTENSION)
-  ImageLoadingTracker loader(this);
-  int resource_id;
-  ASSERT_EQ(true,
-            loader.IsComponentExtensionResource(extension.get(),
-                                                resource.relative_path(),
-                                                &resource_id));
-  ASSERT_EQ(IDR_FILE_MANAGER_ICON_16, resource_id);
-#endif
-}

[Finnur, 2012/10/05 14:41:33]

Same question here...