[Extensions] Fix lifetime bug in ExtensionAction/IconImage

chrome/browser/extensions/extension_action_icon_factory_unittest.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_icon_factory.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/files/file_util.h"
@@ skipping 257 matching lines @@
   // manifest and does not call |SetIcon| by default (but has an browser action
   // icon resource).
   scoped_refptr<Extension> extension(CreateExtension(
       "browser_action/no_icon", Manifest::INVALID_LOCATION));
   ASSERT_TRUE(extension.get() != NULL);
   ExtensionAction* browser_action = GetBrowserAction(*extension);
   ASSERT_TRUE(browser_action);
   ASSERT_FALSE(browser_action->default_icon());
   ASSERT_TRUE(browser_action->GetExplicitlySetIcon(0 /*tab id*/).IsEmpty());
 
+  scoped_refptr<const Extension> extension_with_icon =
+      CreateExtension("browser_action_with_icon", Manifest::INVALID_LOCATION);
+  ASSERT_TRUE(extension_with_icon);
+
   int icon_size = ExtensionAction::ActionIconSize();
   gfx::Image default_icon =
-      EnsureImageSize(LoadIcon("browser_action/no_icon/icon.png"), icon_size);
+      EnsureImageSize(LoadIcon("browser_action_with_icon/icon.png"), icon_size);
   ASSERT_FALSE(default_icon.IsEmpty());
 
-  std::unique_ptr<ExtensionIconSet> default_icon_set(new ExtensionIconSet());
-  default_icon_set->Add(icon_size, "icon.png");
-
-  browser_action->SetDefaultIconForTest(std::move(default_icon_set));
+  browser_action = GetBrowserAction(*extension_with_icon);
   ASSERT_TRUE(browser_action->default_icon());
 
   ExtensionActionIconFactory icon_factory(
-      profile(), extension.get(), browser_action, this);
+      profile(), extension_with_icon.get(), browser_action, this);
 
   gfx::Image icon = icon_factory.GetIcon(0);
 
   // The icon should be loaded asynchronously. Initially a transparent icon
   // should be returned.
   EXPECT_TRUE(ImageRepsAreEqual(
       CreateBlankRep(icon_size, 1.0f),
       icon.ToImageSkia()->GetRepresentation(1.0f)));
 
   WaitForIconUpdate();
 
   icon = icon_factory.GetIcon(0);
 
   // The default icon representation should be loaded at this point.
   EXPECT_TRUE(ImageRepsAreEqual(
       default_icon.ToImageSkia()->GetRepresentation(1.0f),
       icon.ToImageSkia()->GetRepresentation(1.0f)));
 
   // The same icon should be returned for the other tabs.
   icon = icon_factory.GetIcon(1);
 
   EXPECT_TRUE(ImageRepsAreEqual(
       default_icon.ToImageSkia()->GetRepresentation(1.0f),
       icon.ToImageSkia()->GetRepresentation(1.0f)));
 
 }
 
 }  // namespace
 }  // namespace extensions