Add a class to replace ImageLoadingTracker with a nicer API.

chrome/browser/extensions/image_utils_unittest.cc

 // Copyright (c) 2012 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/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"
 #include "base/path_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/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"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/size.h"
 
 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_),
         file_thread_(BrowserThread::FILE),
         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();
     image_ = image;
   }
 
   void WaitForImageLoad() {
     quit_in_image_loaded_ = true;
     MessageLoop::current()->Run();
     quit_in_image_loaded_ = false;
@@ skipping 42 matching lines @@
   }
 
   int image_loaded_count_;
   bool quit_in_image_loaded_;
   MessageLoop ui_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
   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);
 
   ExtensionResource image_resource =
       extension->GetIconResource(extension_misc::EXTENSION_ICON_SMALLISH,
                                  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());
 
   WaitForImageLoad();
 
   // We should have gotten the image.
   EXPECT_EQ(1, image_loaded_count());
 
   // 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);
 
   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());
 
   // Send out notification the extension was uninstalled.
   extensions::UnloadedExtensionInfo details(extension.get(),
       extension_misc::UNLOAD_REASON_UNINSTALL);
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_UNLOADED,
       content::NotificationService::AllSources(),
       content::Details<extensions::UnloadedExtensionInfo>(&details));
 
   // Chuck the extension, that way if anyone tries to access it we should crash
   // or get valgrind errors.
   extension = NULL;
 
   WaitForImageLoad();
 
   // Even though we deleted the extension, we should still get the image.
   // We should still have gotten the image.
   EXPECT_EQ(1, image_loaded_count());
 
   // Check that the image was loaded.
   EXPECT_EQ(extension_misc::EXTENSION_ICON_SMALLISH,
             image_.ToSkBitmap()->width());
 }
 
 // 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());
 
   WaitForImageLoad();
 
   // We should have gotten the image.
   EXPECT_EQ(1, image_loaded_count());
 
   // Check that all images were loaded.
   std::vector<gfx::ImageSkiaRep> image_reps =
       image_.ToImageSkia()->image_reps();
   ASSERT_EQ(2u, image_reps.size());
   const gfx::ImageSkiaRep* img_rep1 = &image_reps[0];
   const gfx::ImageSkiaRep* img_rep2 = &image_reps[1];
   if (img_rep1->pixel_width() > img_rep2->pixel_width()) {
     std::swap(img_rep1, img_rep2);
   }
   EXPECT_EQ(extension_misc::EXTENSION_ICON_BITTY,
             img_rep1->pixel_width());
   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...