Convert extension action icons code to use ImageSkia instead of SkBitmap

chrome/browser/extensions/api/extension_action/browser_action_apitest.cc

Index: chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
diff --git a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
index 737b94c248cf4ec7c8a9a8c3f8a1f55ce760b212..c564cb0b628e3b0d1d69597c0689ecd168c777e0 100644
--- a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
+++ b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
@@ -24,6 +24,7 @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
+#include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 
@@ -105,7 +106,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, DynamicBrowserAction) {
   // Set prev_id which holds the id of the previous image, and use it in the
   // next test to see if the image changes.
   uint32_t prev_id = extension->browser_action()->GetIcon(0).
-      ToSkBitmap()->getGenerationID();
+      bitmap()->getGenerationID();
 
   // Tell the extension to update the icon using setIcon({imageData:...}).
   ResultCatcher catcher;
@@ -117,9 +118,9 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, DynamicBrowserAction) {
   EXPECT_TRUE(GetBrowserActionsBar().HasIcon(0));
   EXPECT_NE(prev_id,
             extension->browser_action()->GetIcon(0).
-            ToSkBitmap()->getGenerationID());
+            bitmap()->getGenerationID());
   prev_id = extension->browser_action()->GetIcon(0).
-      ToSkBitmap()->getGenerationID();
+      bitmap()->getGenerationID();
 
   // Tell the extension to update the icon using setIcon({path:...}).
   ui_test_utils::NavigateToURL(browser(),
@@ -128,7 +129,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, DynamicBrowserAction) {
   EXPECT_TRUE(GetBrowserActionsBar().HasIcon(0));
   EXPECT_NE(prev_id,
             extension->browser_action()->GetIcon(0).
-            ToSkBitmap()->getGenerationID());
+            bitmap()->getGenerationID());
 }
 
 // This test is flaky as per http://crbug.com/74557.