Convert extension action icons code to use ImageSkia instead of SkBitmap

chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc

Index: chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
diff --git a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
index 67420301ede6bb849a4bf5f419684431f4ecd25b..4c23e6ad55f708e644492524f12b2cceb0754a1a 100644
--- a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
@@ -223,7 +223,8 @@ class BrowserActionButton : public content::NotificationObserver,
                      const std::string& extension_id,
                      int index) OVERRIDE {
     extension_->browser_action()->CacheIcon(
-        extension_->browser_action()->default_icon_path(), image);
+        extension_->browser_action()->default_icon_path(),
+        *image.ToImageSkia());
     UpdateState();
   }
 
@@ -240,18 +241,17 @@ class BrowserActionButton : public content::NotificationObserver,
     else
       gtk_widget_set_tooltip_text(button(), tooltip.c_str());
 
-    gfx::Image image = extension_->browser_action()->GetIcon(tab_id);
-    if (!image.IsEmpty())
-      SetImage(image.ToGdkPixbuf());
+    gfx::ImageSkia image = extension_->browser_action()->GetIcon(tab_id);
+    if (!image.empty())
+      SetImage(gfx::GdkPixbufFromSkBitmap(*image.bitmap()));
     bool enabled = extension_->browser_action()->GetIsVisible(tab_id);
     gtk_widget_set_sensitive(button(), enabled);
 
     gtk_widget_queue_draw(button());
   }
 
-  SkBitmap GetIcon() {
-    return *extension_->browser_action()->GetIcon(
-        toolbar_->GetCurrentTabId()).ToSkBitmap();
+  gfx::ImageSkia GetIcon() {
+    return extension_->browser_action()->GetIcon(toolbar_->GetCurrentTabId());
   }
 
   MenuGtk* GetContextMenu() {