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

chrome/common/extensions/extension.cc

Index: chrome/common/extensions/extension.cc
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index 990271e17965fb76156cfce707cc728c617aec50..2fe50b27c25987ab3189c7d0c669e23b6ec29236 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -806,10 +806,10 @@ scoped_ptr<ExtensionAction> Extension::LoadExtensionActionHelper(
     string16* error) {
   scoped_ptr<ExtensionAction> result(new ExtensionAction(id(), action_type));
 
-  // Page actions are hidden/disabled by default, and browser actions are
+  // Page/script actions are hidden/disabled by default, and browser actions are
   // visible/enabled by default.
   result->SetIsVisible(ExtensionAction::kDefaultTabId,
-                       action_type != ExtensionAction::TYPE_PAGE);
+                       action_type == ExtensionAction::TYPE_BROWSER);
 
   if (manifest_version_ == 1) {
     const ListValue* icons = NULL;
@@ -2377,8 +2377,6 @@ bool Extension::LoadScriptBadge(string16* error) {
             IDR_EXTENSIONS_FAVICON).ToSkBitmap());
   }
 
-  script_badge_->SetIsVisible(ExtensionAction::kDefaultTabId, true);
-
   return true;
 }