Move icon fallbacks into ExtensionAction.

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 3d2bbe2679c9f41b02c5637bf1d9d7914cc4b4e9..1535138d40037e202c52141d19cab89505bc9425 100644
--- a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
+++ b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
@@ -104,7 +104,9 @@ 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).getGenerationID();
+  ExtensionAction::PathToIconCache empty_cache;
+  uint32_t prev_id = extension->browser_action()->GetIcon(0, empty_cache).
+      ToSkBitmap()->getGenerationID();
 
   // Tell the extension to update the icon using setIcon({imageData:...}).
   ResultCatcher catcher;
@@ -114,15 +116,20 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, DynamicBrowserAction) {
 
   // Test that we received the changes.
   EXPECT_TRUE(GetBrowserActionsBar().HasIcon(0));
-  EXPECT_NE(prev_id, extension->browser_action()->GetIcon(0).getGenerationID());
-  prev_id = extension->browser_action()->GetIcon(0).getGenerationID();
+  EXPECT_NE(prev_id,
+            extension->browser_action()->GetIcon(0, empty_cache).
+            ToSkBitmap()->getGenerationID());
+  prev_id = extension->browser_action()->GetIcon(0, empty_cache).
+      ToSkBitmap()->getGenerationID();
 
   // Tell the extension to update the icon using setIcon({path:...}).
   ui_test_utils::NavigateToURL(browser(),
       GURL(extension->GetResourceURL("update2.html")));
   ASSERT_TRUE(catcher.GetNextResult());
   EXPECT_TRUE(GetBrowserActionsBar().HasIcon(0));
-  EXPECT_NE(prev_id, extension->browser_action()->GetIcon(0).getGenerationID());
+  EXPECT_NE(prev_id,
+            extension->browser_action()->GetIcon(0, empty_cache).
+            ToSkBitmap()->getGenerationID());
 }
 
 // This test is flaky as per http://crbug.com/74557.