Move application creation and extension install prompt showing off Browser and onto ExtensionTabHel…

chrome/browser/extensions/extension_browsertest.cc

Index: chrome/browser/extensions/extension_browsertest.cc
===================================================================
--- chrome/browser/extensions/extension_browsertest.cc	(revision 145147)
+++ chrome/browser/extensions/extension_browsertest.cc	(working copy)
@@ -231,7 +231,8 @@
 // This class is used to simulate an installation abort by the user.
 class MockAbortExtensionInstallPrompt : public ExtensionInstallPrompt {
  public:
-  MockAbortExtensionInstallPrompt() : ExtensionInstallPrompt(NULL) {}
+  MockAbortExtensionInstallPrompt() : ExtensionInstallPrompt(NULL, NULL, NULL) {
+  }
 
   // Simulate a user abort on an extension installation.
   virtual void ConfirmInstall(Delegate* delegate, const Extension* extension) {
@@ -246,8 +247,10 @@
 
 class MockAutoConfirmExtensionInstallPrompt : public ExtensionInstallPrompt {
  public:
-  explicit MockAutoConfirmExtensionInstallPrompt(Browser* browser) :
-      ExtensionInstallPrompt(browser) {}
+  explicit MockAutoConfirmExtensionInstallPrompt(gfx::NativeWindow parent,
+                                                 content::PageNavigator* navigator,

[Aaron Boodman, 2012/07/03 00:52:14]

8



0




cols

[Ben Goodger (Google), 2012/07/03 19:17:00]

Done.

+                                                 Profile* profile) :
+      ExtensionInstallPrompt(parent, navigator, profile) {}
 
   // Proceed without confirmation prompt.
   virtual void ConfirmInstall(Delegate* delegate, const Extension* extension) {
@@ -284,12 +287,17 @@
 
   {
     ExtensionInstallPrompt* install_ui = NULL;
-    if (ui_type == INSTALL_UI_TYPE_CANCEL)
+    if (ui_type == INSTALL_UI_TYPE_CANCEL) {
       install_ui = new MockAbortExtensionInstallPrompt();
-    else if (ui_type == INSTALL_UI_TYPE_NORMAL)
-      install_ui = new ExtensionInstallPrompt(browser);
-    else if (ui_type == INSTALL_UI_TYPE_AUTO_CONFIRM)
-      install_ui = new MockAutoConfirmExtensionInstallPrompt(browser);
+    } else if (ui_type == INSTALL_UI_TYPE_NORMAL) {
+      install_ui = chrome::CreateExtensionInstallPromptWithBrowser(browser);
+    } else if (ui_type == INSTALL_UI_TYPE_AUTO_CONFIRM) {
+      gfx::NativeWindow parent =
+          browser->window() ? browser->window()->GetNativeWindow() : NULL;
+      install_ui = new MockAutoConfirmExtensionInstallPrompt(parent,
+                                                             browser,
+                                                             browser->profile());

[Aaron Boodman, 2012/07/03 00:52:14]

................................................................................
cols

[Ben Goodger (Google), 2012/07/03 19:17:00]

Done.

+    }
 
     // TODO(tessamac): Update callers to always pass an unpacked extension
     //                 and then always pack the extension here.