Show extension icons next to their top-level context menu items....

chrome/browser/extensions/image_loading_tracker_unittest.cc

 // Copyright (c) 2010 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/message_loop.h"
 #include "base/path_service.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
@@ skipping 84 matching lines @@
   ChromeThread io_thread_;
 };
 
 // Tests asking ImageLoadingTracker to cache pushes the result to the Extension.
 TEST_F(ImageLoadingTrackerTest, Cache) {
   scoped_ptr<Extension> extension(CreateExtension());
   ASSERT_TRUE(extension.get() != NULL);
 
   ExtensionResource image_resource =
       extension->GetIconPath(Extension::EXTENSION_ICON_SMALLISH);
+  gfx::Size max_size(Extension::EXTENSION_ICON_SMALLISH,
+                     Extension::EXTENSION_ICON_SMALLISH);
   ImageLoadingTracker loader(static_cast<ImageLoadingTracker::Observer*>(this));
   loader.LoadImage(extension.get(),
                    image_resource,
-                   gfx::Size(Extension::EXTENSION_ICON_SMALLISH,
-                             Extension::EXTENSION_ICON_SMALLISH),
+                   max_size,
                    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 the image was loaded.
   EXPECT_EQ(Extension::EXTENSION_ICON_SMALLISH, image_.width());
 
   // The image should be cached in the Extension.
-  EXPECT_TRUE(extension->HasCachedImage(image_resource));
+  EXPECT_TRUE(extension->HasCachedImage(image_resource, max_size));
 
   // Make sure the image is in the extension.
   EXPECT_EQ(Extension::EXTENSION_ICON_SMALLISH,
-            extension->GetCachedImage(image_resource).width());
+            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,
-                   gfx::Size(Extension::EXTENSION_ICON_SMALLISH,
-                             Extension::EXTENSION_ICON_SMALLISH),
+                   max_size,
                    ImageLoadingTracker::CACHE);
   // We should have gotten the image.
   EXPECT_EQ(1, image_loaded_count());
 
   // Check that the image was loaded.
   EXPECT_EQ(Extension::EXTENSION_ICON_SMALLISH, image_.width());
 }
 
 // Tests deleting an extension while waiting for the image to load doesn't cause
 // problems.
@@ skipping 25 matching lines @@
 
   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::EXTENSION_ICON_SMALLISH, image_.width());
 }