Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1335)

Unified Diff: chrome/browser/download/download_browsertest.cc

Issue 10699057: Move application creation and extension install prompt showing off Browser and onto ExtensionTabHel… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/download/download_browsertest.cc
===================================================================
--- chrome/browser/download/download_browsertest.cc (revision 145357)
+++ 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,11 @@
// installation.
class MockAutoConfirmExtensionInstallPrompt : public ExtensionInstallPrompt {
public:
- explicit MockAutoConfirmExtensionInstallPrompt(Browser* browser)
- : ExtensionInstallPrompt(browser) {}
+ explicit MockAutoConfirmExtensionInstallPrompt(
+ gfx::NativeWindow parent,
+ content::PageNavigator* navigator,
+ Profile* profile)
+ : ExtensionInstallPrompt(parent, navigator, profile) {}
// Proceed without confirmation prompt.
virtual void ConfirmInstall(Delegate* delegate, const Extension* extension) {
@@ -840,6 +844,16 @@
return result && DownloadManager::EnsureNoPendingDownloadsForTesting();
}
+ // A mock install prompt that simulates the user allowing an install request.
+ void SetAllowMockInstallPrompt() {
+ gfx::NativeWindow parent =
+ browser()->window() ? browser()->window()->GetNativeWindow() : NULL;
+ download_crx_util::SetMockInstallPromptForTesting(
+ new MockAutoConfirmExtensionInstallPrompt(parent,
+ browser(),
+ browser()->profile()));
+ }
+
private:
static void EnsureNoPendingDownloadJobsOnIO(bool* result) {
if (URLRequestSlowDownloadJob::NumberOutstandingRequests())
@@ -1715,8 +1729,7 @@
// Install a mock install UI that simulates a user allowing permission to
// finish the install.
- download_crx_util::SetMockInstallPromptForTesting(
- new MockAutoConfirmExtensionInstallPrompt(browser()));
+ SetAllowMockInstallPrompt();
scoped_ptr<DownloadTestObserver> observer(
DangerousDownloadWaiter(
@@ -1746,8 +1759,7 @@
// 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.
- download_crx_util::SetMockInstallPromptForTesting(
- new MockAutoConfirmExtensionInstallPrompt(browser()));
+ SetAllowMockInstallPrompt();
scoped_ptr<DownloadTestObserver> observer(
DangerousDownloadWaiter(
@@ -1774,8 +1786,7 @@
// Install a mock install UI that simulates a user allowing permission to
// finish the install.
- download_crx_util::SetMockInstallPromptForTesting(
- new MockAutoConfirmExtensionInstallPrompt(browser()));
+ SetAllowMockInstallPrompt();
scoped_ptr<DownloadTestObserver> observer(
DangerousDownloadWaiter(
« no previous file with comments | « chrome/browser/chromeos/extensions/file_manager_util.cc ('k') | chrome/browser/download/download_crx_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698