Add support for multiple icon sizes for Mac platform apps

chrome/browser/extensions/image_loading_tracker_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 "base/json/json_file_value_serializer.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "chrome/browser/extensions/image_loading_tracker.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_icon_set.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "content/public/browser/notification_service.h"
 #include "content/test/test_browser_thread.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/size.h"
 
 using content::BrowserThread;
 
 class ImageLoadingTrackerTest : public testing::Test,
                                 public ImageLoadingTracker::Observer {
  public:
   ImageLoadingTrackerTest()
       : 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(SkBitmap* image, const ExtensionResource& resource,
-                             int index) {
+  virtual void OnImageLoaded(const gfx::Image& image,
+                             const std::string& extension_id,
+                             int index) OVERRIDE {
     image_loaded_count_++;
     if (quit_in_image_loaded_)
       MessageLoop::current()->Quit();
-    if (image)
-      image_ = *image;
-    else
-      image_.reset();
+    image_ = image;
   }
 
   void WaitForImageLoad() {
     quit_in_image_loaded_ = true;
     MessageLoop::current()->Run();
     quit_in_image_loaded_ = false;
   }
 
   int image_loaded_count() {
     int result = image_loaded_count_;
@@ skipping 21 matching lines @@
       return NULL;
 
     EXPECT_TRUE(valid_value.get());
     if (!valid_value.get())
       return NULL;
 
     return Extension::Create(test_file, Extension::INVALID, *valid_value,
         Extension::STRICT_ERROR_CHECKS, &error);
   }
 
-  SkBitmap image_;
+  gfx::Image image_;
 
  private:
   virtual void SetUp() {
     file_thread_.Start();
     io_thread_.Start();
   }
 
   int image_loaded_count_;
   bool quit_in_image_loaded_;
   MessageLoop ui_loop_;
@@ skipping 20 matching lines @@
 
   // 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(ExtensionIconSet::EXTENSION_ICON_SMALLISH, image_.width());
+  EXPECT_EQ(ExtensionIconSet::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(ExtensionIconSet::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());
 
   // Check that the image was loaded.
-  EXPECT_EQ(ExtensionIconSet::EXTENSION_ICON_SMALLISH, image_.width());
+  EXPECT_EQ(ExtensionIconSet::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) {
   scoped_refptr<Extension> extension(CreateExtension());
   ASSERT_TRUE(extension.get() != NULL);
 
   ExtensionResource image_resource =
       extension->GetIconResource(ExtensionIconSet::EXTENSION_ICON_SMALLISH,
@@ skipping 20 matching lines @@
   // 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(ExtensionIconSet::EXTENSION_ICON_SMALLISH, image_.width());
+  EXPECT_EQ(ExtensionIconSet::EXTENSION_ICON_SMALLISH,
+            image_.ToSkBitmap()->width());
 }
+
+// Tests loading multiple images.

[Finnur, 2012/02/28 10:26:51]

same here: Tests loading multiple dimension of the same image.

[sail, 2012/02/28 23:25:36]

Done.

+TEST_F(ImageLoadingTrackerTest, MultipleImages) {
+  scoped_refptr<Extension> extension(CreateExtension());
+  ASSERT_TRUE(extension.get() != NULL);
+
+  std::vector<ImageLoadingTracker::ImageInfo> info_list;
+  int sizes[] = {ExtensionIconSet::EXTENSION_ICON_SMALLISH,
+                 ExtensionIconSet::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::ImageInfo(
+        resource, gfx::Size(sizes[i], sizes[i])));
+  }
+
+  ImageLoadingTracker loader(static_cast<ImageLoadingTracker::Observer*>(this));

[Finnur, 2012/02/28 10:26:51]

I forget, why is this cast needed again?

[sail, 2012/02/28 23:25:36]

Done.
Not sure, removed.

+  loader.LoadImages(extension.get(), info_list, ImageLoadingTracker::CACHE);
+
+  // 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.
+  ASSERT_EQ(2u, image_.GetNumberOfSkBitmaps());
+  const SkBitmap* bmp1 = image_.GetSkBitmapAtIndex(0);
+  const SkBitmap* bmp2 = image_.GetSkBitmapAtIndex(1);
+  if (bmp1->width() > bmp2->width()) {
+    std::swap(bmp1, bmp2);
+  }
+  EXPECT_EQ(ExtensionIconSet::EXTENSION_ICON_BITTY, bmp1->width());
+  EXPECT_EQ(ExtensionIconSet::EXTENSION_ICON_SMALLISH, bmp2->width());
+}