1 files changed, 9 insertions, 7 deletions
diff --git a/chrome/browser/extensions/extension_install_dialog.cc b/chrome/browser/extensions/extension_install_dialog.cc
index d580bfe..293adfa 100644
--- a/chrome/browser/extensions/extension_install_dialog.cc
+++ b/chrome/browser/extensions/extension_install_dialog.cc
@@ -12,8 +12,6 @@
 #include "base/values.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
-#include "third_party/skia/include/core/SkBitmap.h"
-#include "ui/gfx/image/image.h"
 
 namespace {
 
@@ -61,17 +59,19 @@ AutoConfirmForTest CheckAutoConfirmCommandLineSwitch() {
 
 void ShowExtensionInstallDialog(Profile* profile,
                                 ExtensionInstallUI::Delegate* delegate,
+                                const Extension* extension,
+                                SkBitmap* icon,
                                 const ExtensionInstallUI::Prompt& prompt) {
   AutoConfirmForTest auto_confirm = CheckAutoConfirmCommandLineSwitch();
   if (auto_confirm != DO_NOT_SKIP) {
     DoAutoConfirm(auto_confirm, delegate);
     return;
   }
-  ShowExtensionInstallDialogImpl(profile, delegate, prompt);
+  ShowExtensionInstallDialogImpl(profile, delegate, extension, icon, prompt);
 }
 
 bool ShowExtensionInstallDialogForManifest(
-    Profile* profile,
+    Profile *profile,
     ExtensionInstallUI::Delegate* delegate,
     const DictionaryValue* manifest,
     const std::string& id,
@@ -120,9 +120,11 @@ bool ShowExtensionInstallDialogForManifest(
   ExtensionInstallUI::Prompt filled_out_prompt = prompt;
   filled_out_prompt.SetPermissions(
       (*dummy_extension)->GetPermissionMessageStrings());
-  filled_out_prompt.set_extension(*dummy_extension);
-  filled_out_prompt.set_icon(gfx::Image(new SkBitmap(*icon)));
 
-  ShowExtensionInstallDialog(profile, delegate, filled_out_prompt);
+  ShowExtensionInstallDialog(profile,
+                             delegate,
+                             dummy_extension->get(),
+                             icon,
+                             filled_out_prompt);
   return true;
 }