[Extensions] Don't use ExtensionInstallPrompt subclasses for auto-confirmation

chrome/browser/extensions/extension_install_prompt.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_install_prompt.h"
 
 #include "base/location.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 604 matching lines @@
       error);
 }
 
 ExtensionInstallPrompt::ExtensionInstallPrompt(content::WebContents* contents)
     : profile_(ProfileForWebContents(contents)),
       ui_loop_(base::MessageLoop::current()),
       extension_(NULL),
       install_ui_(extensions::CreateExtensionInstallUI(
           ProfileForWebContents(contents))),
       show_params_(new ExtensionInstallPromptShowParams(contents)),
-      delegate_(NULL) {
+      delegate_(NULL),
+      did_call_show_dialog_(false) {
 }
 
 ExtensionInstallPrompt::ExtensionInstallPrompt(Profile* profile,
                                                gfx::NativeWindow native_window)
     : profile_(profile),
       ui_loop_(base::MessageLoop::current()),
       extension_(NULL),
       install_ui_(extensions::CreateExtensionInstallUI(profile)),
       show_params_(
           new ExtensionInstallPromptShowParams(profile, native_window)),
-      delegate_(NULL) {
+      delegate_(NULL),
+      did_call_show_dialog_(false) {
 }
 
 ExtensionInstallPrompt::~ExtensionInstallPrompt() {
 }
 
 void ExtensionInstallPrompt::ShowDialog(
     Delegate* delegate,
     const Extension* extension,
     const SkBitmap* icon,
     const ShowDialogCallback& show_dialog_callback) {
@@ skipping 173 matching lines @@
       DCHECK(prompt_->bundle());
       break;
     }
     case LAUNCH_PROMPT_DEPRECATED:
     default:
       NOTREACHED() << "Unknown message";
       return;
   }
   prompt_->set_icon(gfx::Image::CreateFrom1xBitmap(icon_));
 
-  g_last_prompt_type_for_tests = prompt_->type();
-
-  if (AutoConfirmPrompt(delegate_))
-    return;
-
   if (show_params_->WasParentDestroyed()) {
     delegate_->InstallUIAbort(false);
     return;
   }
 
+  g_last_prompt_type_for_tests = prompt_->type();
+  did_call_show_dialog_ = true;
+
+  if (AutoConfirmPrompt(delegate_))
+    return;
+
   if (show_dialog_callback_.is_null())
     GetDefaultShowDialogCallback().Run(show_params_.get(), delegate_,
                                        prompt_.Pass());
   else
     show_dialog_callback_.Run(show_params_.get(), delegate_, prompt_.Pass());
 }