Move icon fallbacks into ExtensionAction.

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "build/build_config.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 86 matching lines @@
   ASSERT_TRUE(RunExtensionTest("browser_action/no_icon")) << message_;
   const Extension* extension = GetSingleLoadedExtension();
   ASSERT_TRUE(extension) << message_;
 
   // Test that there is a browser action in the toolbar.
   ASSERT_EQ(1, GetBrowserActionsBar().NumberOfBrowserActions());
   EXPECT_TRUE(GetBrowserActionsBar().HasIcon(0));
 
   // 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;
   ui_test_utils::NavigateToURL(browser(),
       GURL(extension->GetResourceURL("update.html")));
   ASSERT_TRUE(catcher.GetNextResult());
 
   // 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.
 IN_PROC_BROWSER_TEST_F(BrowserActionApiTest,
                        DISABLED_TabSpecificBrowserActionState) {
   ASSERT_TRUE(RunExtensionTest("browser_action/tab_specific_state")) <<
       message_;
   const Extension* extension = GetSingleLoadedExtension();
   ASSERT_TRUE(extension) << message_;
 
@@ skipping 326 matching lines @@
   ResultCatcher catcher;
   ui_test_utils::NavigateToURL(browser(),
       GURL(extension->GetResourceURL("update.html")));
   ASSERT_TRUE(catcher.GetNextResult());
 
   // Test the getters for a specific tab.
   ui_test_utils::NavigateToURL(browser(),
       GURL(extension->GetResourceURL("update2.html")));
   ASSERT_TRUE(catcher.GetNextResult());
 }