Index: chrome/browser/extensions/image_loading_tracker_unittest.cc |
diff --git a/chrome/browser/extensions/image_loading_tracker_unittest.cc b/chrome/browser/extensions/image_loading_tracker_unittest.cc |
index 54d1958ec2f4e69cce927653e45a256b299c7c6c..b3be4f2ec0225a0ce615521dcfd56cf6d18a9803 100644 |
--- a/chrome/browser/extensions/image_loading_tracker_unittest.cc |
+++ b/chrome/browser/extensions/image_loading_tracker_unittest.cc |
@@ -2,10 +2,13 @@ |
// 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 <algorithm> |
tbarzic
2012/07/25 19:37:34
pkotwicz 2012/07/25 02:00:39
Nit: I don't think yo
tbarzic
2012/07/25 19:53:53
Done.
|
+ |
#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" |
@@ -197,14 +200,17 @@ TEST_F(ImageLoadingTrackerTest, MultipleImages) { |
"image_loading_tracker", Extension::INVALID)); |
ASSERT_TRUE(extension.get() != NULL); |
- std::vector<ImageLoadingTracker::ImageInfo> info_list; |
+ std::vector<ImageLoadingTracker::ImageRepInfo> 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]))); |
+ info_list.push_back(ImageLoadingTracker::ImageRepInfo( |
+ resource, |
+ ImageLoadingTracker::ImageRepInfo::RESIZE_WHEN_LARGER, |
+ gfx::Size(sizes[i], sizes[i]), |
+ ui::SCALE_FACTOR_NONE)); |
} |
ImageLoadingTracker loader(this); |