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 e8a89aa2d0ddcd062c6c18b9aab5a53f3db07e59..81494b5c3fedce05ffb240f45a5d3192078e15ac 100644
--- a/chrome/browser/ui/views/browser_action_view.h
+++ b/chrome/browser/ui/views/browser_action_view.h
@@ -64,10 +64,8 @@ class BrowserActionView : public views::View {
 
   BrowserActionButton* button() { return button_; }
 
-  // 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();
+  // Gets browser action button icon with the badge.
+  gfx::ImageSkia GetIconWithBadge();
 
   // Overridden from views::View:
   virtual void Layout() OVERRIDE;