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

Unified Diff: chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc

Issue 1527043002: [Extensions] Don't use ExtensionInstallPrompt subclasses for auto-confirmation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years 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
« no previous file with comments | « chrome/browser/extensions/webstore_inline_installer_browsertest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc
diff --git a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc
index 4bf13876ef8e55840f7f4fdf40052dc80d914be2..c74bbf62e3a04ad3f72f9a213f5ba3d5a817a07b 100644
--- a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc
+++ b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc
@@ -114,21 +114,6 @@ void ExtensionSettingsUIBrowserTest::ShrinkWebContentsView() {
ResizeWebContents(web_contents, gfx::Size(400, 400));
}
-class MockAutoConfirmExtensionInstallPrompt : public ExtensionInstallPrompt {
- public:
- explicit MockAutoConfirmExtensionInstallPrompt(
- content::WebContents* web_contents)
- : ExtensionInstallPrompt(web_contents) {}
-
- // Proceed without confirmation prompt.
- void ShowDialog(Delegate* delegate,
- const Extension* extension,
- const SkBitmap* icon,
- const ShowDialogCallback& show_dialog_callback) override {
- delegate->InstallUIProceed();
- }
-};
-
const Extension* ExtensionSettingsUIBrowserTest::InstallUnpackedExtension(
const base::FilePath& path) {
if (path.empty())
@@ -161,9 +146,11 @@ const Extension* ExtensionSettingsUIBrowserTest::InstallExtension(
service->set_show_extensions_prompts(false);
size_t num_before = registry->enabled_extensions().size();
{
- scoped_ptr<ExtensionInstallPrompt> install_ui;
- install_ui.reset(new MockAutoConfirmExtensionInstallPrompt(
- browser()->tab_strip_model()->GetActiveWebContents()));
+ extensions::ScopedTestDialogAutoConfirm auto_confirm(
+ extensions::ScopedTestDialogAutoConfirm::ACCEPT);
+ scoped_ptr<ExtensionInstallPrompt> install_ui(
+ new ExtensionInstallPrompt(
+ browser()->tab_strip_model()->GetActiveWebContents()));
base::FilePath crx_path = path;
DCHECK(crx_path.Extension() == FILE_PATH_LITERAL(".crx"));
« no previous file with comments | « chrome/browser/extensions/webstore_inline_installer_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698