[Extensions] Fix crash in extension uninstall dialog

Refcount an extension so that it if it happens to be reloaded while the dialog
is showing, we don't crash.

BUG=487161
TBR=sky@chromium.org (small extension_uninstall_dialog_view.cc changes, reviewed by kalman)

Review URL: https://codereview.chromium.org/1140053004

Cr-Commit-Position: refs/heads/master@{#330143}

chrome/browser/extensions/extension_uninstall_dialog.cc

@@ -48,8 +48,6 @@ ExtensionUninstallDialog::ExtensionUninstallDialog(
     ExtensionUninstallDialog::Delegate* delegate)
     : profile_(profile),
       delegate_(delegate),
-      extension_(NULL),
-      triggering_extension_(NULL),
       ui_loop_(base::MessageLoop::current()) {
 }
 
@@ -71,7 +69,7 @@ void ExtensionUninstallDialog::ConfirmUninstall(const Extension* extension) {
                             ? extension_misc::EXTENSION_ICON_SMALL * 2
                             : extension_misc::EXTENSION_ICON_LARGE;
   ExtensionResource image = IconsInfo::GetIconResource(
-      extension_, icon_size, ExtensionIconSet::MATCH_BIGGER);
+      extension_.get(), icon_size, ExtensionIconSet::MATCH_BIGGER);
 
   // Load the image asynchronously. The response will be sent to OnImageLoaded.
   ImageLoader* loader = ImageLoader::Get(profile_);
@@ -83,7 +81,7 @@ void ExtensionUninstallDialog::ConfirmUninstall(const Extension* extension) {
       ImageLoader::ImageRepresentation::NEVER_RESIZE,
       gfx::Size(),
       ui::SCALE_FACTOR_100P));
-  loader->LoadImagesAsync(extension_,
+  loader->LoadImagesAsync(extension_.get(),
                           images_list,
                           base::Bind(&ExtensionUninstallDialog::OnImageLoaded,
                                      AsWeakPtr(),
@@ -130,7 +128,7 @@ std::string ExtensionUninstallDialog::GetHeadingText() {
 }
 
 bool ExtensionUninstallDialog::ShouldShowReportAbuseCheckbox() const {
-  return ManifestURL::UpdatesFromGallery(extension_);
+  return ManifestURL::UpdatesFromGallery(extension_.get());
 }
 
 void ExtensionUninstallDialog::OnDialogClosed(CloseAction action) {

chrome/browser/extensions/extension_uninstall_dialog.h

@@ -91,11 +91,11 @@ class ExtensionUninstallDialog
   Delegate* delegate_;
 
   // The extension we are showing the dialog for.
-  const Extension* extension_;
+  scoped_refptr<const Extension> extension_;
 
   // The extension triggering the dialog if the dialog was shown by
   // chrome.management.uninstall.
-  const Extension* triggering_extension_;
+  scoped_refptr<const Extension> triggering_extension_;
 
   // The extensions icon.
   gfx::ImageSkia icon_;

chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc

@@ -69,8 +69,7 @@ class ExtensionUninstallDialogDelegateView : public views::DialogDelegateView {
  public:
   ExtensionUninstallDialogDelegateView(
       ExtensionUninstallDialogViews* dialog_view,
-      const extensions::Extension* extension,
-      const extensions::Extension* triggering_extension,
+      bool triggered_by_extension,
       gfx::ImageSkia* image);
   ~ExtensionUninstallDialogDelegateView() override;
 
@@ -135,7 +134,7 @@ void ExtensionUninstallDialogViews::Show() {
   }
 
   view_ = new ExtensionUninstallDialogDelegateView(
-      this, extension_, triggering_extension_, &icon_);
+      this, triggering_extension_.get() != nullptr, &icon_);
   constrained_window::CreateBrowserModalDialogViews(view_, parent_)->Show();
 }
 
@@ -162,11 +161,10 @@ void ExtensionUninstallDialogViews::ExtensionUninstallCanceled() {
 
 ExtensionUninstallDialogDelegateView::ExtensionUninstallDialogDelegateView(
     ExtensionUninstallDialogViews* dialog_view,
-    const extensions::Extension* extension,
-    const extensions::Extension* triggering_extension,
+    bool triggered_by_extension,
     gfx::ImageSkia* image)
     : dialog_(dialog_view),
-      triggered_by_extension_(triggering_extension != NULL),
+      triggered_by_extension_(triggered_by_extension),
       report_abuse_checkbox_(nullptr) {
   // Scale down to icon size, but allow smaller icons (don't scale up).
   gfx::Size size(image->width(), image->height());