Convert ui::MenuModel to use gfx::Image instead of ImageSkia.

chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc

Index: chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc
diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc b/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc
index 499b2ccc3ddc403c5f13e8826db4ed1b3893ffaa..2abee51c7bae829d2e5f96b9ab800cccf1d2a9a9 100644
--- a/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc
+++ b/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc
@@ -534,7 +534,7 @@ TEST_F(BackFwdMenuModelTest, FaviconLoadTest) {
 
   // Will return the current icon (default) but start an anync call
   // to retrieve the favicon from the favicon service.
-  gfx::ImageSkia default_icon;
+  gfx::Image default_icon;
   back_model.GetIconAt(0, &default_icon);
 
   // Make the favicon service run GetFavIconForURL,
@@ -545,12 +545,12 @@ TEST_F(BackFwdMenuModelTest, FaviconLoadTest) {
   EXPECT_TRUE(favicon_delegate.was_called());
 
   // Verify the bitmaps match.
-  gfx::ImageSkia valid_icon;
+  gfx::Image valid_icon;
   // This time we will get the new favicon returned.
   back_model.GetIconAt(0, &valid_icon);
 
-  SkBitmap default_icon_bitmap = *default_icon.bitmap();
-  SkBitmap valid_icon_bitmap = *valid_icon.bitmap();
+  SkBitmap default_icon_bitmap = *default_icon.ToSkBitmap();
+  SkBitmap valid_icon_bitmap = *valid_icon.ToSkBitmap();
 
   SkAutoLockPixels a(new_icon_bitmap);
   SkAutoLockPixels b(valid_icon_bitmap);