Add support for getting the 256x256 app icon on Windows.

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 "base/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/gfx_paths.h"
 #include "ui/gfx/icon_util.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/size.h"
+#include "ui/test/ui_unittests_resource.h"
 
 namespace {
 
 static const char kSmallIconName[] = "icon_util/16_X_16_icon.ico";
 static const char kLargeIconName[] = "icon_util/128_X_128_icon.ico";
 static const char kTempIconFilename[] = "temp_test_icon.ico";
 
 class IconUtilTest : public testing::Test {
  public:
   IconUtilTest() {
@@ skipping 261 matching lines @@
   ASSERT_GE(icon_data.length(),
             png_entry->dwImageOffset + png_entry->dwBytesInRes);
   const unsigned char* png_bytes = reinterpret_cast<const unsigned char*>(
       icon_data.data() + png_entry->dwImageOffset);
   gfx::Image image = gfx::Image::CreateFrom1xPNGBytes(png_bytes,
                                                       png_entry->dwBytesInRes);
   SkBitmap bitmap = image.AsBitmap();
   EXPECT_EQ(256, bitmap.width());
   EXPECT_EQ(256, bitmap.height());
 }
+
+TEST_F(IconUtilTest, TestCreateSkBitmapFromIconResource48x48) {
+  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());
+}
+
+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());
+}