[Extensions] Fix lifetime bug in ExtensionAction/IconImage

chrome/browser/extensions/extension_action_manager.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/browser/extensions/extension_action_manager.h"
 
+#include "base/memory/ptr_util.h"
 #include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
+#include "extensions/browser/extension_icon_image.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/extensions_browser_client.h"
 #include "extensions/common/constants.h"
+#include "ui/gfx/image/image_skia.h"
 
 namespace extensions {
 
 namespace {
 
 // BrowserContextKeyedServiceFactory for ExtensionActionManager.
 class ExtensionActionManagerFactory : public BrowserContextKeyedServiceFactory {
  public:
   // BrowserContextKeyedServiceFactory implementation:
   static ExtensionActionManager* GetForBrowserContext(
@@ skipping 75 matching lines @@
     return nullptr;
 
   // Only create action info for enabled extensions.
   // This avoids bugs where actions are recreated just after being removed
   // in response to OnExtensionUnloaded().
   if (!ExtensionRegistry::Get(profile)
       ->enabled_extensions().Contains(extension.id())) {
     return nullptr;
   }
 
-  std::unique_ptr<ExtensionAction> action(
-      new ExtensionAction(extension, action_type, *action_info));
+  auto action =
+      base::MakeUnique<ExtensionAction>(extension, action_type, *action_info);
+
+  if (action->default_icon()) {
+    action->SetDefaultIconImage(base::MakeUnique<IconImage>(
+        profile, &extension, *action->default_icon(),
+        ExtensionAction::ActionIconSize(),
+        ExtensionAction::FallbackIcon().AsImageSkia(), nullptr));
+  }
+
   ExtensionAction* raw_action = action.get();
   (*map)[extension.id()] = std::move(action);
   return raw_action;
 }
 
 }  // namespace
 
 ExtensionAction* ExtensionActionManager::GetPageAction(
     const Extension& extension) const {
   return GetOrCreateOrNull(&page_actions_, extension,
@@ skipping 40 matching lines @@
                            profile_);
 }
 
 ExtensionAction* ExtensionActionManager::GetExtensionAction(
     const Extension& extension) const {
   ExtensionAction* action = GetBrowserAction(extension);
   return action ? action : GetPageAction(extension);
 }
 
 }  // namespace extensions