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

chrome/browser/download/download_browsertest.cc

Index: chrome/browser/download/download_browsertest.cc
===================================================================
--- chrome/browser/download/download_browsertest.cc	(revision 145147)
+++ chrome/browser/download/download_browsertest.cc	(working copy)
@@ -158,7 +158,8 @@
 // extensions tests.  Find a common place for this class.
 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) {
@@ -174,8 +175,10 @@
 // installation.
 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]

80 cols, 80 cols. 80 80 80 80 eight-y 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) {
@@ -1715,8 +1718,12 @@
 
   // Install a mock install UI that simulates a user allowing permission to
   // finish the install.
+  gfx::NativeWindow parent =

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

These lines are repeated several times. Could you add
DownloadTest::CreateAutoConfirmInstallPrompt() ?

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

Done. I made it set the mock prompt, since all the callers do that too.

+      browser()->window() ? browser()->window()->GetNativeWindow() : NULL;
   download_crx_util::SetMockInstallPromptForTesting(
-      new MockAutoConfirmExtensionInstallPrompt(browser()));
+      new MockAutoConfirmExtensionInstallPrompt(parent,
+                                                browser(),
+                                                browser()->profile()));
 
   scoped_ptr<DownloadTestObserver> observer(
       DangerousDownloadWaiter(
@@ -1746,8 +1753,12 @@
   // Install a mock install UI that simulates a user allowing permission to
   // finish the install, and dismisses any error message.  We check that the
   // install failed below.
+  gfx::NativeWindow parent =
+      browser()->window() ? browser()->window()->GetNativeWindow() : NULL;
   download_crx_util::SetMockInstallPromptForTesting(
-      new MockAutoConfirmExtensionInstallPrompt(browser()));
+      new MockAutoConfirmExtensionInstallPrompt(parent,
+                                                browser(),
+                                                browser()->profile()));
 
   scoped_ptr<DownloadTestObserver> observer(
       DangerousDownloadWaiter(
@@ -1774,8 +1785,12 @@
 
   // Install a mock install UI that simulates a user allowing permission to
   // finish the install.
+  gfx::NativeWindow parent =
+      browser()->window() ? browser()->window()->GetNativeWindow() : NULL;
   download_crx_util::SetMockInstallPromptForTesting(
-      new MockAutoConfirmExtensionInstallPrompt(browser()));
+      new MockAutoConfirmExtensionInstallPrompt(parent,
+                                                browser(),
+                                                browser()->profile()));
 
   scoped_ptr<DownloadTestObserver> observer(
       DangerousDownloadWaiter(