Fix a race condition when an IconAnimation is still running at browser shutdown.

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

Index: chrome/browser/extensions/api/extension_action/script_badge_apitest.cc
diff --git a/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc b/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc
index fd841953ac375685899075f92ffd4cfb760793d5..8e9a3c1b4215dc28b60f61070f9e8dffc8caf189 100644
--- a/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc
+++ b/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc
@@ -5,30 +5,51 @@
 #include "chrome/browser/extensions/browser_event_router.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/location_bar_controller.h"
+#include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/web_contents.h"
+#include "net/base/mock_host_resolver.h"
+#include "net/test/test_server.h"
+#include "testing/gmock/include/gmock/gmock.h"
 
 using extensions::Extension;
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ScriptBadge) {
+class ScriptBadgeApiTest : public ExtensionApiTest {
+ protected:
+  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+    ExtensionApiTest::SetUpCommandLine(command_line);
+    command_line->AppendSwitch(switches::kEnableScriptBadges);
+  }
+};
+
+IN_PROC_BROWSER_TEST_F(ScriptBadgeApiTest, Basics) {
   ASSERT_TRUE(test_server()->Start());
   ASSERT_TRUE(RunExtensionTest("script_badge/basics")) << message_;
   const Extension* extension = GetSingleLoadedExtension();
   ASSERT_TRUE(extension) << message_;
-  const ExtensionAction* script_badge = extension->script_badge();
+  ExtensionAction* script_badge = extension->script_badge();
   ASSERT_TRUE(script_badge);
+  const extensions::LocationBarController* location_bar_controller =
+      chrome::GetActiveTabContents(browser())->extension_tab_helper()->
+      location_bar_controller();
 
   const int tab_id = SessionID::IdForTab(
       chrome::GetActiveTabContents(browser()));
   EXPECT_EQ(GURL(extension->GetResourceURL("default_popup.html")),
             script_badge->GetPopupUrl(tab_id));
 
+  EXPECT_FALSE(script_badge->GetIsVisible(tab_id));
+  EXPECT_THAT(location_bar_controller->GetCurrentActions(),
+              testing::ElementsAre());
+
   {
     ResultCatcher catcher;
     // Tell the extension to update the script badge state.
@@ -49,4 +70,15 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ScriptBadge) {
         browser()->profile(), *script_badge, tab_id);
     EXPECT_TRUE(catcher.GetNextResult());
   }
+
+  {
+    ResultCatcher catcher;
+    // Visit a non-extension page so the extension can run a content script and
+    // cause the script badge to be animated in.
+    ui_test_utils::NavigateToURL(browser(), test_server()->GetURL(""));
+    ASSERT_TRUE(catcher.GetNextResult());
+  }
+  EXPECT_TRUE(script_badge->GetIsVisible(tab_id));
+  EXPECT_THAT(location_bar_controller->GetCurrentActions(),
+              testing::ElementsAre(script_badge));
 }