Load extension icons for more scale factors.

extensions/browser/image_loader_unittest.cc

 // Copyright 2014 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 "extensions/browser/image_loader.h"
 
 #include <stddef.h>
 
 #include "base/files/file_path.h"
 #include "base/json/json_file_value_serializer.h"
@@ skipping 189 matching lines @@
       CreateExtension("image_loader", Manifest::INVALID_LOCATION));
   ASSERT_TRUE(extension.get() != NULL);
 
   std::vector<ImageLoader::ImageRepresentation> info_list;
   int sizes[] = {extension_misc::EXTENSION_ICON_BITTY,
                  extension_misc::EXTENSION_ICON_SMALLISH, };
   for (size_t i = 0; i < arraysize(sizes); ++i) {
     ExtensionResource resource = IconsInfo::GetIconResource(
         extension.get(), sizes[i], ExtensionIconSet::MATCH_EXACTLY);
     info_list.push_back(ImageLoader::ImageRepresentation(
-        resource,
-        ImageLoader::ImageRepresentation::RESIZE_WHEN_LARGER,
-        gfx::Size(sizes[i], sizes[i]),
-        ui::SCALE_FACTOR_NONE));
+        resource, ImageLoader::ImageRepresentation::RESIZE_WHEN_LARGER,
+        gfx::Size(sizes[i], sizes[i]), 1.f));
   }
 
   ImageLoader loader;
   loader.LoadImagesAsync(extension.get(), info_list,
                          base::Bind(&ImageLoaderTest::OnImageLoaded,
                                     base::Unretained(this)));
 
   // The image isn't cached, so we should not have received notification.
   EXPECT_EQ(0, image_loaded_count());
 
@@ skipping 21 matching lines @@
       CreateExtension("image_loader", Manifest::INVALID_LOCATION));
   ASSERT_TRUE(extension.get() != NULL);
 
   std::vector<ImageLoader::ImageRepresentation> info_list;
   int sizes[] = {extension_misc::EXTENSION_ICON_BITTY,
                  extension_misc::EXTENSION_ICON_SMALLISH, };
   for (size_t i = 0; i < arraysize(sizes); ++i) {
     ExtensionResource resource = IconsInfo::GetIconResource(
         extension.get(), sizes[i], ExtensionIconSet::MATCH_EXACTLY);
     info_list.push_back(ImageLoader::ImageRepresentation(
-        resource,
-        ImageLoader::ImageRepresentation::NEVER_RESIZE,
-        gfx::Size(sizes[i], sizes[i]),
-        ui::SCALE_FACTOR_100P));
+        resource, ImageLoader::ImageRepresentation::NEVER_RESIZE,
+        gfx::Size(sizes[i], sizes[i]), 1.f));
   }
 
   // Add a second icon of 200P which should get grouped with the smaller icon's
   // ImageSkia.
   ExtensionResource resource =
       IconsInfo::GetIconResource(extension.get(),
                                  extension_misc::EXTENSION_ICON_SMALLISH,
                                  ExtensionIconSet::MATCH_EXACTLY);
   info_list.push_back(ImageLoader::ImageRepresentation(
-      resource,
-      ImageLoader::ImageRepresentation::NEVER_RESIZE,
+      resource, ImageLoader::ImageRepresentation::NEVER_RESIZE,
       gfx::Size(extension_misc::EXTENSION_ICON_BITTY,
                 extension_misc::EXTENSION_ICON_BITTY),
-      ui::SCALE_FACTOR_200P));
+      2.f));
 
   ImageLoader loader;
   loader.LoadImageFamilyAsync(extension.get(),
                               info_list,
                               base::Bind(&ImageLoaderTest::OnImageFamilyLoaded,
                                          base::Unretained(this)));
 
   // The image isn't cached, so we should not have received notification.
   EXPECT_EQ(0, image_loaded_count());
 
@@ skipping 19 matching lines @@
 
   const gfx::ImageSkiaRep* img_rep1 = &image_reps[0];
   const gfx::ImageSkiaRep* img_rep2 = &image_reps[1];
   EXPECT_EQ(extension_misc::EXTENSION_ICON_BITTY, img_rep1->pixel_width());
   EXPECT_EQ(1.0f, img_rep1->scale());
   EXPECT_EQ(extension_misc::EXTENSION_ICON_SMALLISH, img_rep2->pixel_width());
   EXPECT_EQ(2.0f, img_rep2->scale());
 }
 
 }  // namespace extensions