Add support for multi resolution icons

ui/gfx/image_unittest.h

Index: ui/gfx/image_unittest.h
diff --git a/ui/gfx/image_unittest.h b/ui/gfx/image_unittest.h
index 09abfcedc6bd449de39665cc1396250deab3bde5..8935cb785cff0271e06590b58ab8137c087ffa87 100644
--- a/ui/gfx/image_unittest.h
+++ b/ui/gfx/image_unittest.h
@@ -30,16 +30,16 @@ typedef GdkPixbuf* PlatformImage;
 typedef const SkBitmap* PlatformImage;
 #endif
 
-SkBitmap* CreateBitmap() {
+inline SkBitmap* CreateBitmap(int width, int height) {
   SkBitmap* bitmap = new SkBitmap();
-  bitmap->setConfig(SkBitmap::kARGB_8888_Config, 25, 25);
+  bitmap->setConfig(SkBitmap::kARGB_8888_Config, width, height);
   bitmap->allocPixels();
   bitmap->eraseRGB(255, 0, 0);
   return bitmap;
 }
 
-PlatformImage CreatePlatformImage() {
-  scoped_ptr<SkBitmap> bitmap(CreateBitmap());
+inline PlatformImage CreatePlatformImage() {
+  scoped_ptr<SkBitmap> bitmap(CreateBitmap(25, 25));
 #if defined(OS_MACOSX)
   NSImage* image = gfx::SkBitmapToNSImage(*(bitmap.get()));
   base::mac::NSObjectRetain(image);
@@ -51,7 +51,7 @@ PlatformImage CreatePlatformImage() {
 #endif
 }
 
-gfx::Image::RepresentationType GetPlatformRepresentationType() {
+inline gfx::Image::RepresentationType GetPlatformRepresentationType() {
 #if defined(OS_MACOSX)
   return gfx::Image::kNSImageRep;
 #elif defined(OS_LINUX) && !defined(TOOLKIT_VIEWS)