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

ash/launcher/launcher_button.cc

Index: ash/launcher/launcher_button.cc
diff --git a/ash/launcher/launcher_button.cc b/ash/launcher/launcher_button.cc
index c6758eb00f0d090b8f0e298e8821cb74527cabcd..a5a739e803a32f41080ea3b747c495058df53e29 100644
--- a/ash/launcher/launcher_button.cc
+++ b/ash/launcher/launcher_button.cc
@@ -150,7 +150,7 @@ void LauncherButton::SetShadowedImage(const SkBitmap& bitmap) {
 void LauncherButton::SetImage(const SkBitmap& image) {
   if (image.empty()) {
     // TODO: need an empty image.
-    icon_view_->SetImage(&image);
+    icon_view_->SetImage(image);
     return;
   }
 
@@ -309,7 +309,7 @@ void LauncherButton::UpdateState() {
     else
       bar_id = IDR_AURA_LAUNCHER_UNDERLINE_RUNNING;
 
-    bar_->SetImage(rb.GetImageNamed(bar_id).ToSkBitmap());
+    bar_->SetImage(rb.GetImageNamed(bar_id).ToImageSkia());
   }
 
   Layout();