diff options
author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 06:46:10 +0000 |
---|---|---|
committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 06:46:10 +0000 |
commit | 4930760d08e0d3afef5e99684fc7450b15d0cf78 (patch) | |
tree | d4d02e538c145096e8ba74bc8cb34a72a6d83647 /chrome/browser/extensions/image_loading_tracker_unittest.cc | |
parent | 022a8ca1d96755b98c26c6211968415fe7c2f458 (diff) | |
download | chromium_src-4930760d08e0d3afef5e99684fc7450b15d0cf78.zip chromium_src-4930760d08e0d3afef5e99684fc7450b15d0cf78.tar.gz chromium_src-4930760d08e0d3afef5e99684fc7450b15d0cf78.tar.bz2 |
Revert r50779 as it breaks memory tests
TBR=asargent@chromium.org
TEST=Tree goes green
Review URL: http://codereview.chromium.org/2812025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50828 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/image_loading_tracker_unittest.cc')
-rw-r--r-- | chrome/browser/extensions/image_loading_tracker_unittest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/extensions/image_loading_tracker_unittest.cc b/chrome/browser/extensions/image_loading_tracker_unittest.cc index 974ce54..4659496 100644 --- a/chrome/browser/extensions/image_loading_tracker_unittest.cc +++ b/chrome/browser/extensions/image_loading_tracker_unittest.cc @@ -102,12 +102,11 @@ TEST_F(ImageLoadingTrackerTest, Cache) { 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, - max_size, + gfx::Size(Extension::EXTENSION_ICON_SMALLISH, + Extension::EXTENSION_ICON_SMALLISH), ImageLoadingTracker::CACHE); // The image isn't cached, so we should not have received notification. @@ -122,16 +121,17 @@ TEST_F(ImageLoadingTrackerTest, Cache) { EXPECT_EQ(Extension::EXTENSION_ICON_SMALLISH, image_.width()); // The image should be cached in the Extension. - EXPECT_TRUE(extension->HasCachedImage(image_resource, max_size)); + EXPECT_TRUE(extension->HasCachedImage(image_resource)); // Make sure the image is in the extension. EXPECT_EQ(Extension::EXTENSION_ICON_SMALLISH, - extension->GetCachedImage(image_resource, max_size).width()); + extension->GetCachedImage(image_resource).width()); // Ask the tracker for the image again, this should call us back immediately. loader.LoadImage(extension.get(), image_resource, - max_size, + gfx::Size(Extension::EXTENSION_ICON_SMALLISH, + Extension::EXTENSION_ICON_SMALLISH), ImageLoadingTracker::CACHE); // We should have gotten the image. EXPECT_EQ(1, image_loaded_count()); |