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

chrome/common/extensions/extension.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 "chrome/common/extensions/extension.h"
 
 #include <ostream>
 
 #include "base/base64.h"
 #include "base/basictypes.h"
@@ skipping 788 matching lines @@
 
   return true;
 }
 
 scoped_ptr<ExtensionAction> Extension::LoadExtensionActionHelper(
     const DictionaryValue* extension_action,
     ExtensionAction::Type action_type,
     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;
     if (extension_action->HasKey(keys::kPageActionIcons) &&
         extension_action->GetList(keys::kPageActionIcons, &icons)) {
       for (ListValue::const_iterator iter = icons->begin();
            iter != icons->end(); ++iter) {
         std::string path;
         if (!(*iter)->GetAsString(&path) || path.empty()) {
           *error = ASCIIToUTF16(errors::kInvalidPageActionIconPath);
@@ skipping 1547 matching lines @@
                                         ExtensionIconSet::MATCH_EXACTLY);
   if (!icon16_path.empty()) {
     script_badge_->set_default_icon_path(icon16_path);
   } else {
     script_badge_->SetIcon(
         ExtensionAction::kDefaultTabId,
         *ui::ResourceBundle::GetSharedInstance().GetImageNamed(
             IDR_EXTENSIONS_FAVICON).ToSkBitmap());
   }
 
-  script_badge_->SetIsVisible(ExtensionAction::kDefaultTabId, true);
-
   return true;
 }
 
 bool Extension::LoadFileBrowserHandlers(string16* error) {
   if (!manifest_->HasKey(keys::kFileBrowserHandlers))
     return true;
   ListValue* file_browser_handlers_value = NULL;
   if (!manifest_->GetList(keys::kFileBrowserHandlers,
                          &file_browser_handlers_value)) {
     *error = ASCIIToUTF16(errors::kInvalidFileBrowserHandler);
@@ skipping 1492 matching lines @@
 
 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo(
     const Extension* extension,
     const PermissionSet* permissions,
     Reason reason)
     : reason(reason),
       extension(extension),
       permissions(permissions) {}
 
 }   // namespace extensions