Convert extension action icons code to use ImageSkia instead of SkBitmap

chrome/browser/ui/cocoa/extensions/browser_action_button.mm

Index: chrome/browser/ui/cocoa/extensions/browser_action_button.mm
diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm
index a2d31c39a4acf592091d48d5701ac242876f58e6..35b3685e71cd23f7a1ab1bba20897df43381cfb9 100644
--- a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm
+++ b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm
@@ -25,6 +25,8 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia_paint.h"
 #include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_util_mac.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 #include "ui/gfx/size.h"
@@ -72,7 +74,8 @@ class ExtensionImageTrackerBridge : public content::NotificationObserver,
   void OnImageLoaded(const gfx::Image& image,
                      const std::string& extension_id,
                      int index) OVERRIDE {
-    browser_action_->CacheIcon(browser_action_->default_icon_path(), image);
+    browser_action_->CacheIcon(browser_action_->default_icon_path(),
+                               *image.ToImageSkia());
     [owner_ updateState];
   }
 
@@ -249,9 +252,11 @@ class ExtensionImageTrackerBridge : public content::NotificationObserver,
     [self setToolTip:base::SysUTF8ToNSString(tooltip)];
   }
 
-  gfx::Image image = extension_->browser_action()->GetIcon(tabId_);
-  if (!image.IsEmpty())
-    [self setImage:image.ToNSImage()];
+  gfx::ImageSkia image = extension_->browser_action()->GetIcon(tabId_);
+  if (!image.empty()) {
+    NSImage* image_ns = gfx::NSImageFromImageSkia(image);
+    [self setImage:image_ns];
+  }
 
   [[self cell] setTabId:tabId_];