Convert extension action icons code to use ImageSkia instead of SkBitmap

chrome/browser/ui/views/browser_action_view.h

Index: chrome/browser/ui/views/browser_action_view.h
diff --git a/chrome/browser/ui/views/browser_action_view.h b/chrome/browser/ui/views/browser_action_view.h
index 316ab876c47e8780502cf441b7d24faadd88c905..a37bbd384e6d8f1e89e3fb896456e8577ac4563b 100644
--- a/chrome/browser/ui/views/browser_action_view.h
+++ b/chrome/browser/ui/views/browser_action_view.h
@@ -156,7 +156,7 @@ class BrowserActionView : public views::View {
   // Allocates a canvas object on the heap and draws into it the icon for the
   // view as well as the badge (if any). Caller is responsible for deleting the
   // returned object.
-  gfx::Canvas* GetIconWithBadge();
+  gfx::ImageSkia GetIconWithBadge();
 
   // Overridden from views::View:
   virtual void Layout() OVERRIDE;