Change SetImage, SetBackground, and SetToggledImage to take in a gfx::ImageSkia

ui/views/controls/button/image_button_unittest.cc

Index: ui/views/controls/button/image_button_unittest.cc
diff --git a/ui/views/controls/button/image_button_unittest.cc b/ui/views/controls/button/image_button_unittest.cc
index 9d9a9b1ee01ba9b138e94b1512a91d9b7b172705..f9b17c85f1a945550ff48f527bb5c4a3d2ba4b03 100644
--- a/ui/views/controls/button/image_button_unittest.cc
+++ b/ui/views/controls/button/image_button_unittest.cc
@@ -35,7 +35,7 @@ TEST_F(ImageButtonTest, Basics) {
   EXPECT_EQ("5x15", button.GetPreferredSize().ToString());
 
   // Set a normal image.
-  SkBitmap normal_bitmap = CreateTestBitmap(10, 20);
+  gfx::ImageSkia normal_bitmap = CreateTestBitmap(10, 20);
   button.SetImage(CustomButton::BS_NORMAL, &normal_bitmap);
 
   // Image uses normal image for painting.
@@ -47,7 +47,7 @@ TEST_F(ImageButtonTest, Basics) {
   EXPECT_EQ("10x20", button.GetPreferredSize().ToString());
 
   // Set a pushed image.
-  SkBitmap pushed_bitmap = CreateTestBitmap(11, 21);
+  gfx::ImageSkia pushed_bitmap = CreateTestBitmap(11, 21);
   button.SetImage(CustomButton::BS_PUSHED, &pushed_bitmap);
 
   // By convention, preferred size doesn't change, even though pushed image