Replaced GetAppIconForSize with GetAppIconImageFamily.

ui/gfx/icon_util_unittest.cc

 // Copyright (c) 2011 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 "ui/gfx/icon_util.h"
 
+#include <vector>
+
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/gfx_paths.h"
 #include "ui/gfx/icon_util_unittests_resource.h"
 #include "ui/gfx/image/image.h"
@@ skipping 380 matching lines @@
   // Test with an empty and non-empty image.
   // The empty image should be ignored.
   image_family.clear();
   image_family.Add(gfx::Image());
   image_family.Add(gfx::Image::CreateFrom1xBitmap(CreateBlackSkBitmap(16, 16)));
   ASSERT_TRUE(IconUtil::CreateIconFileFromImageFamily(image_family,
                                                        icon_filename));
   CheckAllIconSizes(icon_filename, 48);
 }
 
-TEST_F(IconUtilTest, TestCreateSkBitmapFromIconResource48x48) {
+TEST_F(IconUtilTest, TestCreateImageFamilyFromIconResource) {
   HMODULE module = GetModuleHandle(NULL);
-  scoped_ptr<SkBitmap> bitmap(
-      IconUtil::CreateSkBitmapFromIconResource(module, IDR_MAINFRAME, 48));
-  ASSERT_TRUE(bitmap.get());
-  EXPECT_EQ(48, bitmap->width());
-  EXPECT_EQ(48, bitmap->height());
-}
+  scoped_ptr<gfx::ImageFamily> family(
+      IconUtil::CreateImageFamilyFromIconResource(module, IDR_MAINFRAME));
+  ASSERT_TRUE(family.get());
+  EXPECT_FALSE(family->empty());
+  std::vector<gfx::Image> images;
+  for (const auto& image : *family)
+    images.push_back(image);
 
-TEST_F(IconUtilTest, TestCreateSkBitmapFromIconResource256x256) {
-  HMODULE module = GetModuleHandle(NULL);
-  scoped_ptr<SkBitmap> bitmap(
-      IconUtil::CreateSkBitmapFromIconResource(module, IDR_MAINFRAME, 256));
-  ASSERT_TRUE(bitmap.get());
-  EXPECT_EQ(256, bitmap->width());
-  EXPECT_EQ(256, bitmap->height());
+  // Assert that the family contains all of the images from the icon resource.
+  EXPECT_EQ(5, images.size());
+  EXPECT_EQ(16, images[0].Width());
+  EXPECT_EQ(24, images[1].Width());
+  EXPECT_EQ(32, images[2].Width());
+  EXPECT_EQ(48, images[3].Width());
+  EXPECT_EQ(256, images[4].Width());
 }
 
 // This tests that kNumIconDimensionsUpToMediumSize has the correct value.
 TEST_F(IconUtilTest, TestNumIconDimensionsUpToMediumSize) {
   ASSERT_LE(IconUtil::kNumIconDimensionsUpToMediumSize,
             IconUtil::kNumIconDimensions);
   EXPECT_EQ(IconUtil::kMediumIconSize,
             IconUtil::kIconDimensions[
                 IconUtil::kNumIconDimensionsUpToMediumSize - 1]);
 }