Create a toplevel gfx/ dir and seed it with icon_util....

app/gfx/icon_util_unittest.cc

Index: app/gfx/icon_util_unittest.cc
===================================================================
--- app/gfx/icon_util_unittest.cc	(revision 41521)
+++ app/gfx/icon_util_unittest.cc	(working copy)
@@ -1,260 +0,0 @@
-// Copyright (c) 2006-2008 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 "app/app_paths.h"
-#include "app/gfx/icon_util.h"
-#include "base/gfx/size.h"
-#include "base/scoped_ptr.h"
-#include "base/file_util.h"
-#include "base/path_service.h"
-#include "third_party/skia/include/core/SkBitmap.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace {
-
-  static const wchar_t* const kSmallIconName = L"icon_util\\16_X_16_icon.ico";
-  static const wchar_t* const kLargeIconName = L"icon_util\\128_X_128_icon.ico";
-  static const wchar_t* const kTempIconFilename = L"temp_test_icon.ico";
-
-  class IconUtilTest : public testing::Test {
-   public:
-    IconUtilTest() {
-      PathService::Get(app::DIR_TEST_DATA, &test_data_directory_);
-    }
-    ~IconUtilTest() {}
-
-    static const int kSmallIconWidth = 16;
-    static const int kSmallIconHeight = 16;
-    static const int kLargeIconWidth = 128;
-    static const int kLargeIconHeight = 128;
-
-    // Given a file name for an .ico file and an image dimentions, this
-    // function loads the icon and returns an HICON handle.
-    HICON LoadIconFromFile(const std::wstring& filename,
-                           int width,
-                           int height) {
-      HICON icon =
-          static_cast<HICON>(LoadImage(NULL,
-                                       filename.c_str(),
-                                       IMAGE_ICON,
-                                       width,
-                                       height,
-                                       LR_LOADTRANSPARENT | LR_LOADFROMFILE));
-      return icon;
-    }
-
-   protected:
-    // The root directory for test files.
-    std::wstring test_data_directory_;
-
-   private:
-    DISALLOW_EVIL_CONSTRUCTORS(IconUtilTest);
-  };
-};
-
-// The following test case makes sure IconUtil::SkBitmapFromHICON fails
-// gracefully when called with invalid input parameters.
-TEST_F(IconUtilTest, TestIconToBitmapInvalidParameters) {
-  std::wstring icon_filename(test_data_directory_);
-  file_util::AppendToPath(&icon_filename, kSmallIconName);
-  gfx::Size icon_size(kSmallIconWidth, kSmallIconHeight);
-  HICON icon = LoadIconFromFile(icon_filename,
-                                icon_size.width(),
-                                icon_size.height());
-  ASSERT_TRUE(icon != NULL);
-
-  // Invalid size parameter.
-  gfx::Size invalid_icon_size(kSmallIconHeight, 0);
-  EXPECT_EQ(IconUtil::CreateSkBitmapFromHICON(icon, invalid_icon_size),
-            static_cast<SkBitmap*>(NULL));
-
-  // Invalid icon.
-  EXPECT_EQ(IconUtil::CreateSkBitmapFromHICON(NULL, icon_size),
-            static_cast<SkBitmap*>(NULL));
-
-  // The following code should succeed.
-  scoped_ptr<SkBitmap> bitmap;
-  bitmap.reset(IconUtil::CreateSkBitmapFromHICON(icon, icon_size));
-  EXPECT_NE(bitmap.get(), static_cast<SkBitmap*>(NULL));
-  ::DestroyIcon(icon);
-}
-
-// The following test case makes sure IconUtil::CreateHICONFromSkBitmap fails
-// gracefully when called with invalid input parameters.
-TEST_F(IconUtilTest, TestBitmapToIconInvalidParameters) {
-  HICON icon = NULL;
-  scoped_ptr<SkBitmap> bitmap;
-
-  // Wrong bitmap format.
-  bitmap.reset(new SkBitmap);
-  ASSERT_NE(bitmap.get(), static_cast<SkBitmap*>(NULL));
-  bitmap->setConfig(SkBitmap::kA8_Config, kSmallIconWidth, kSmallIconHeight);
-  icon = IconUtil::CreateHICONFromSkBitmap(*bitmap);
-  EXPECT_EQ(icon, static_cast<HICON>(NULL));
-
-  // Invalid bitmap size.
-  bitmap.reset(new SkBitmap);
-  ASSERT_NE(bitmap.get(), static_cast<SkBitmap*>(NULL));
-  bitmap->setConfig(SkBitmap::kARGB_8888_Config, 0, 0);
-  icon = IconUtil::CreateHICONFromSkBitmap(*bitmap);
-  EXPECT_EQ(icon, static_cast<HICON>(NULL));
-
-  // Valid bitmap configuration but no pixels allocated.
-  bitmap.reset(new SkBitmap);
-  ASSERT_NE(bitmap.get(), static_cast<SkBitmap*>(NULL));
-  bitmap->setConfig(SkBitmap::kARGB_8888_Config,
-                    kSmallIconWidth,
-                    kSmallIconHeight);
-  icon = IconUtil::CreateHICONFromSkBitmap(*bitmap);
-  EXPECT_TRUE(icon == NULL);
-}
-
-// The following test case makes sure IconUtil::CreateIconFileFromSkBitmap
-// fails gracefully when called with invalid input parameters.
-TEST_F(IconUtilTest, TestCreateIconFileInvalidParameters) {
-  scoped_ptr<SkBitmap> bitmap;
-  std::wstring valid_icon_filename(test_data_directory_);
-  file_util::AppendToPath(&valid_icon_filename, kSmallIconName);
-  std::wstring invalid_icon_filename(L"C:\\<>?.ico");
-
-  // Wrong bitmap format.
-  bitmap.reset(new SkBitmap);
-  ASSERT_NE(bitmap.get(), static_cast<SkBitmap*>(NULL));
-  bitmap->setConfig(SkBitmap::kA8_Config, kSmallIconWidth, kSmallIconHeight);
-  EXPECT_FALSE(IconUtil::CreateIconFileFromSkBitmap(*bitmap,
-                                                    valid_icon_filename));
-
-  // Invalid bitmap size.
-  bitmap.reset(new SkBitmap);
-  ASSERT_NE(bitmap.get(), static_cast<SkBitmap*>(NULL));
-  bitmap->setConfig(SkBitmap::kARGB_8888_Config, 0, 0);
-  EXPECT_FALSE(IconUtil::CreateIconFileFromSkBitmap(*bitmap,
-                                                    valid_icon_filename));
-
-  // Bitmap with no allocated pixels.
-  bitmap.reset(new SkBitmap);
-  ASSERT_NE(bitmap.get(), static_cast<SkBitmap*>(NULL));
-  bitmap->setConfig(SkBitmap::kARGB_8888_Config,
-                    kSmallIconWidth,
-                    kSmallIconHeight);
-  EXPECT_FALSE(IconUtil::CreateIconFileFromSkBitmap(*bitmap,
-                                                    valid_icon_filename));
-
-  // Invalid file name.
-  bitmap->allocPixels();
-  // Setting the pixels to black.
-  memset(bitmap->getPixels(), 0, bitmap->width() * bitmap->height() * 4);
-  EXPECT_FALSE(IconUtil::CreateIconFileFromSkBitmap(*bitmap,
-                                                    invalid_icon_filename));
-}
-
-// This test case makes sure that when we load an icon from disk and convert
-// the HICON into a bitmap, the bitmap has the expected format and dimentions.
-TEST_F(IconUtilTest, TestCreateSkBitmapFromHICON) {
-  scoped_ptr<SkBitmap> bitmap;
-  std::wstring small_icon_filename(test_data_directory_);
-  file_util::AppendToPath(&small_icon_filename, kSmallIconName);
-  gfx::Size small_icon_size(kSmallIconWidth, kSmallIconHeight);
-  HICON small_icon = LoadIconFromFile(small_icon_filename,
-                                      small_icon_size.width(),
-                                      small_icon_size.height());
-  ASSERT_NE(small_icon, static_cast<HICON>(NULL));
-  bitmap.reset(IconUtil::CreateSkBitmapFromHICON(small_icon, small_icon_size));
-  ASSERT_NE(bitmap.get(), static_cast<SkBitmap*>(NULL));
-  EXPECT_EQ(bitmap->width(), small_icon_size.width());
-  EXPECT_EQ(bitmap->height(), small_icon_size.height());
-  EXPECT_EQ(bitmap->config(), SkBitmap::kARGB_8888_Config);
-  ::DestroyIcon(small_icon);
-
-  std::wstring large_icon_filename(test_data_directory_);
-  file_util::AppendToPath(&large_icon_filename, kLargeIconName);
-  gfx::Size large_icon_size(kLargeIconWidth, kLargeIconHeight);
-  HICON large_icon = LoadIconFromFile(large_icon_filename,
-                                      large_icon_size.width(),
-                                      large_icon_size.height());
-  ASSERT_NE(large_icon, static_cast<HICON>(NULL));
-  bitmap.reset(IconUtil::CreateSkBitmapFromHICON(large_icon, large_icon_size));
-  ASSERT_NE(bitmap.get(), static_cast<SkBitmap*>(NULL));
-  EXPECT_EQ(bitmap->width(), large_icon_size.width());
-  EXPECT_EQ(bitmap->height(), large_icon_size.height());
-  EXPECT_EQ(bitmap->config(), SkBitmap::kARGB_8888_Config);
-  ::DestroyIcon(large_icon);
-}
-
-// This test case makes sure that when an HICON is created from an SkBitmap,
-// the returned handle is valid and refers to an icon with the expected
-// dimentions color depth etc.
-TEST_F(IconUtilTest, TestBasicCreateHICONFromSkBitmap) {
-  scoped_ptr<SkBitmap> bitmap;
-  bitmap.reset(new SkBitmap);
-  ASSERT_NE(bitmap.get(), static_cast<SkBitmap*>(NULL));
-  bitmap->setConfig(SkBitmap::kARGB_8888_Config,
-                    kSmallIconWidth,
-                    kSmallIconHeight);
-  bitmap->allocPixels();
-  HICON icon = IconUtil::CreateHICONFromSkBitmap(*bitmap);
-  EXPECT_NE(icon, static_cast<HICON>(NULL));
-  ICONINFO icon_info;
-  ASSERT_TRUE(::GetIconInfo(icon, &icon_info));
-  EXPECT_TRUE(icon_info.fIcon);
-
-  // Now that have the icon information, we should obtain the specification of
-  // the icon's bitmap and make sure it matches the specification of the
-  // SkBitmap we started with.
-  //
-  // The bitmap handle contained in the icon information is a handle to a
-  // compatible bitmap so we need to call ::GetDIBits() in order to retrieve
-  // the bitmap's header information.
-  BITMAPINFO bitmap_info;
-  ::ZeroMemory(&bitmap_info, sizeof(BITMAPINFO));
-  bitmap_info.bmiHeader.biSize = sizeof(BITMAPINFO);
-  HDC hdc = ::GetDC(NULL);
-  int result = ::GetDIBits(hdc,
-                           icon_info.hbmColor,
-                           0,
-                           kSmallIconWidth,
-                           NULL,
-                           &bitmap_info,
-                           DIB_RGB_COLORS);
-  ASSERT_GT(result, 0);
-  EXPECT_EQ(bitmap_info.bmiHeader.biWidth, kSmallIconWidth);
-  EXPECT_EQ(bitmap_info.bmiHeader.biHeight, kSmallIconHeight);
-  EXPECT_EQ(bitmap_info.bmiHeader.biPlanes, 1);
-  EXPECT_EQ(bitmap_info.bmiHeader.biBitCount, 32);
-  ::ReleaseDC(NULL, hdc);
-  ::DestroyIcon(icon);
-}
-
-// The following test case makes sure IconUtil::CreateIconFileFromSkBitmap
-// creates a valid .ico file given an SkBitmap.
-TEST_F(IconUtilTest, TestCreateIconFile) {
-  scoped_ptr<SkBitmap> bitmap;
-  std::wstring icon_filename(test_data_directory_);
-  file_util::AppendToPath(&icon_filename, kTempIconFilename);
-
-  // Allocating the bitmap.
-  bitmap.reset(new SkBitmap);
-  ASSERT_NE(bitmap.get(), static_cast<SkBitmap*>(NULL));
-  bitmap->setConfig(SkBitmap::kARGB_8888_Config,
-                    kSmallIconWidth,
-                    kSmallIconHeight);
-  bitmap->allocPixels();
-
-  // Setting the pixels to black.
-  memset(bitmap->getPixels(), 0, bitmap->width() * bitmap->height() * 4);
-
-  EXPECT_TRUE(IconUtil::CreateIconFileFromSkBitmap(*bitmap,
-                                                   icon_filename));
-
-  // We are currently only testing that it is possible to load an icon from
-  // the .ico file we just created. We don't really check the additional icon
-  // images created by IconUtil::CreateIconFileFromSkBitmap.
-  HICON icon = LoadIconFromFile(icon_filename,
-                                kSmallIconWidth,
-                                kSmallIconHeight);
-  EXPECT_NE(icon, static_cast<HICON>(NULL));
-  if (icon != NULL) {
-    ::DestroyIcon(icon);
-  }
-}