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

chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/toolbar/back_forward_menu_model.h"
 
 #include "base/path_service.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 516 matching lines @@
 
   // Set the desired favicon for url1.
   HistoryServiceFactory::GetForProfile(
       profile(), Profile::EXPLICIT_ACCESS)->AddPage(
           url1, history::SOURCE_BROWSED);
   profile()->GetFaviconService(Profile::EXPLICIT_ACCESS)->SetFavicon(url1,
       url1_favicon, icon_data, history::FAVICON);
 
   // 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,
   // FaviconDelegate.OnIconChanged will be called.
   MessageLoop::current()->Run();
 
   // Verify that the callback executed.
   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);
   SkAutoLockPixels c(default_icon_bitmap);
   // Verify we did not get the default favicon.
   EXPECT_NE(0, memcmp(default_icon_bitmap.getPixels(),
                       valid_icon_bitmap.getPixels(),
                       default_icon_bitmap.getSize()));
   // Verify we did get the expected favicon.
   EXPECT_EQ(0, memcmp(new_icon_bitmap.getPixels(),
                       valid_icon_bitmap.getPixels(),
                       new_icon_bitmap.getSize()));
 
   // Make sure the browser deconstructor doesn't have problems.
   chrome::CloseAllTabs(browser.get());
   // This is required to prevent the message loop from hanging.
   profile()->DestroyHistoryService();
 }