| Index: chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_browsertest.mm
|
| diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_browsertest.mm b/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_browsertest.mm
|
| index 756ef9025b4d7c759501fa790520bb761069cdcb..2e069dd42d362bb6f51e7594aea724dc2697cbb5 100644
|
| --- a/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_browsertest.mm
|
| +++ b/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_browsertest.mm
|
| @@ -5,6 +5,7 @@
|
| #import "chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.h"
|
|
|
| #include "chrome/browser/extensions/extension_install_prompt_show_params.h"
|
| +#include "chrome/browser/extensions/extension_install_prompt_test_helper.h"
|
| #include "chrome/browser/ui/browser.h"
|
| #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller.h"
|
| #import "chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.h"
|
| @@ -31,23 +32,27 @@ IN_PROC_BROWSER_TEST_F(ExtensionInstallDialogControllerTest, BasicTest) {
|
| content::WebContents* tab = browser()->tab_strip_model()->GetWebContentsAt(0);
|
| ExtensionInstallPromptShowParams show_params(tab);
|
|
|
| - chrome::MockExtensionInstallPromptDelegate delegate;
|
| + ExtensionInstallPromptTestHelper test_helper;
|
| scoped_ptr<ExtensionInstallPrompt::Prompt> prompt =
|
| chrome::BuildExtensionInstallPrompt(extension_.get());
|
|
|
| ExtensionInstallDialogController* controller =
|
| - new ExtensionInstallDialogController(&show_params, &delegate,
|
| + new ExtensionInstallDialogController(&show_params,
|
| + test_helper.GetCallback(),
|
| prompt.Pass());
|
|
|
| base::scoped_nsobject<NSWindow> window(
|
| [[[controller->view_controller() view] window] retain]);
|
| EXPECT_TRUE([window isVisible]);
|
|
|
| - // Press cancel to close the window
|
| + // Press cancel to close the window.
|
| [[controller->view_controller() cancelButton] performClick:nil];
|
|
|
| // Wait for the window to finish closing.
|
| EXPECT_FALSE([window isVisible]);
|
| +
|
| + EXPECT_EQ(ExtensionInstallPrompt::Result::USER_CANCELED,
|
| + test_helper.result());
|
| }
|
|
|
| IN_PROC_BROWSER_TEST_F(ExtensionInstallDialogControllerTest,
|
| @@ -55,21 +60,25 @@ IN_PROC_BROWSER_TEST_F(ExtensionInstallDialogControllerTest,
|
| content::WebContents* tab = browser()->tab_strip_model()->GetWebContentsAt(0);
|
| ExtensionInstallPromptShowParams show_params(tab);
|
|
|
| - chrome::MockExtensionInstallPromptDelegate delegate;
|
| + ExtensionInstallPromptTestHelper test_helper;
|
| scoped_ptr<ExtensionInstallPrompt::Prompt> prompt =
|
| chrome::BuildExtensionPostInstallPermissionsPrompt(extension_.get());
|
|
|
| ExtensionInstallDialogController* controller =
|
| - new ExtensionInstallDialogController(&show_params, &delegate,
|
| + new ExtensionInstallDialogController(&show_params,
|
| + test_helper.GetCallback(),
|
| prompt.Pass());
|
|
|
| base::scoped_nsobject<NSWindow> window(
|
| [[[controller->view_controller() view] window] retain]);
|
| EXPECT_TRUE([window isVisible]);
|
|
|
| - // Press cancel to close the window
|
| + // Press cancel to close the window.
|
| [[controller->view_controller() cancelButton] performClick:nil];
|
|
|
| // Wait for the window to finish closing.
|
| EXPECT_FALSE([window isVisible]);
|
| +
|
| + EXPECT_EQ(ExtensionInstallPrompt::Result::USER_CANCELED,
|
| + test_helper.result());
|
| }
|
|
|