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

chrome/browser/extensions/extension_browsertest.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_browsertest.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 213 matching lines @@
   if (!file_util::PathExists(crx_path)) {
     ADD_FAILURE() << crx_path.value() << " was not created.";
     return FilePath();
   }
   return crx_path;
 }
 
 // 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) {
     delegate->InstallUIAbort(true);
     MessageLoopForUI::current()->Quit();
   }
 
   virtual void OnInstallSuccess(const Extension* extension, SkBitmap* icon) {}
 
   virtual void OnInstallFailure(const CrxInstallerError& error) {}
 };
 
 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) {
     delegate->InstallUIProceed();
   }
 };
 
 const Extension* ExtensionBrowserTest::InstallExtensionFromWebstore(
     const FilePath& path,
     int expected_change) {
@@ skipping 16 matching lines @@
     InstallUIType ui_type,
     int expected_change,
     Browser* browser,
     bool from_webstore) {
   ExtensionService* service = browser->profile()->GetExtensionService();
   service->set_show_extensions_prompts(false);
   size_t num_before = service->extensions()->size();
 
   {
     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.
     FilePath crx_path = path;
     if (crx_path.Extension() != FILE_PATH_LITERAL(".crx")) {
       crx_path = PackExtension(path);
     }
     if (crx_path.empty())
       return NULL;
 
@@ skipping 317 matching lines @@
     case content::NOTIFICATION_LOAD_STOP:
       VLOG(1) << "Got LOAD_STOP notification.";
       MessageLoopForUI::current()->Quit();
       break;
 
     default:
       NOTREACHED();
       break;
   }
 }