Revert of Fix crash when user closes window prior to the "Confirm Install" prompt showing

chrome/browser/extensions/external_install_error.cc

 // Copyright 2014 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/external_install_error.h"
 
 #include "base/bind.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/extensions/extension_install_prompt_show_params.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/external_install_manager.h"
 #include "chrome/browser/extensions/webstore_data_fetcher.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/global_error/global_error.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ skipping 292 matching lines @@
     manager_->RemoveExternalInstallError();
   }
 }
 
 void ExternalInstallError::ShowDialog(Browser* browser) {
   DCHECK(install_ui_.get());
   DCHECK(prompt_.get());
   DCHECK(browser);
   content::WebContents* web_contents = NULL;
   web_contents = browser->tab_strip_model()->GetActiveWebContents();
-  install_ui_show_params_.reset(
-      new ExtensionInstallPromptShowParams(web_contents));
+  ExtensionInstallPrompt::ShowParams params(web_contents);
   ExtensionInstallPrompt::GetDefaultShowDialogCallback().Run(
-      install_ui_show_params_.get(), this, prompt_);
+      params, this, prompt_);
 }
 
 const Extension* ExternalInstallError::GetExtension() const {
   return ExtensionRegistry::Get(browser_context_)
       ->GetExtensionById(extension_id_, ExtensionRegistry::EVERYTHING);
 }
 
 void ExternalInstallError::OnWebstoreRequestFailure() {
   OnFetchComplete();
 }
@@ skipping 35 matching lines @@
 
   install_ui_->ConfirmExternalInstall(
       this,
       GetExtension(),
       base::Bind(&ExternalInstallError::OnDialogReady,
                  weak_factory_.GetWeakPtr()),
       prompt_);
 }
 
 void ExternalInstallError::OnDialogReady(
-    ExtensionInstallPromptShowParams* show_params,
+    const ExtensionInstallPrompt::ShowParams& show_params,
     ExtensionInstallPrompt::Delegate* prompt_delegate,
     scoped_refptr<ExtensionInstallPrompt::Prompt> prompt) {
   DCHECK_EQ(this, prompt_delegate);
   prompt_ = prompt;
 
   if (alert_type_ == BUBBLE_ALERT) {
     global_error_.reset(new ExternalInstallBubbleAlert(this, prompt_.get()));
     error_service_->AddGlobalError(global_error_.get());
 
     Browser* browser =
         chrome::FindTabbedBrowser(Profile::FromBrowserContext(browser_context_),
                                   true,
                                   chrome::GetActiveDesktop());
     if (browser)
       global_error_->ShowBubbleView(browser);
   } else {
     DCHECK(alert_type_ == MENU_ALERT);
     global_error_.reset(new ExternalInstallMenuAlert(this));
     error_service_->AddGlobalError(global_error_.get());
   }
 }
 
 }  // namespace extensions