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

Side by Side Diff: chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_browsertest.mm

Issue 683993002: Revert of Fix crash when user closes window prior to the "Confirm Install" prompt showing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/install_prompt_navigator
Patch Set: Created 6 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller. h" 5 #import "chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller. h"
6 6
7 #include "chrome/browser/ui/browser.h" 7 #include "chrome/browser/ui/browser.h"
8 #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_co ntroller.h" 8 #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_co ntroller.h"
9 #import "chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils. h" 9 #import "chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils. h"
10 #import "chrome/browser/ui/cocoa/extensions/extension_install_view_controller.h" 10 #import "chrome/browser/ui/cocoa/extensions/extension_install_view_controller.h"
11 #include "chrome/browser/extensions/extension_install_prompt_show_params.h"
12 #include "chrome/browser/ui/tabs/tab_strip_model.h" 11 #include "chrome/browser/ui/tabs/tab_strip_model.h"
13 #include "chrome/test/base/in_process_browser_test.h" 12 #include "chrome/test/base/in_process_browser_test.h"
14 #include "extensions/common/extension.h" 13 #include "extensions/common/extension.h"
15 14
16 using extensions::Extension; 15 using extensions::Extension;
17 16
18 class ExtensionInstallDialogControllerTest : public InProcessBrowserTest { 17 class ExtensionInstallDialogControllerTest : public InProcessBrowserTest {
19 public: 18 public:
20 ExtensionInstallDialogControllerTest() {} 19 ExtensionInstallDialogControllerTest() {}
21 20
22 void SetUpOnMainThread() override { 21 void SetUpOnMainThread() override {
23 extension_ = chrome::LoadInstallPromptExtension(); 22 extension_ = chrome::LoadInstallPromptExtension();
24 } 23 }
25 24
26 protected: 25 protected:
27 scoped_refptr<Extension> extension_; 26 scoped_refptr<Extension> extension_;
28 }; 27 };
29 28
30 IN_PROC_BROWSER_TEST_F(ExtensionInstallDialogControllerTest, BasicTest) { 29 IN_PROC_BROWSER_TEST_F(ExtensionInstallDialogControllerTest, BasicTest) {
31 content::WebContents* tab = browser()->tab_strip_model()->GetWebContentsAt(0); 30 content::WebContents* tab = browser()->tab_strip_model()->GetWebContentsAt(0);
32 ExtensionInstallPromptShowParams show_params(tab); 31 ExtensionInstallPrompt::ShowParams show_params(tab);
33 32
34 chrome::MockExtensionInstallPromptDelegate delegate; 33 chrome::MockExtensionInstallPromptDelegate delegate;
35 scoped_refptr<ExtensionInstallPrompt::Prompt> prompt = 34 scoped_refptr<ExtensionInstallPrompt::Prompt> prompt =
36 chrome::BuildExtensionInstallPrompt(extension_.get()); 35 chrome::BuildExtensionInstallPrompt(extension_.get());
37 36
38 ExtensionInstallDialogController* controller = 37 ExtensionInstallDialogController* controller =
39 new ExtensionInstallDialogController(&show_params, 38 new ExtensionInstallDialogController(show_params,
40 &delegate, 39 &delegate,
41 prompt); 40 prompt);
42 41
43 base::scoped_nsobject<NSWindow> window( 42 base::scoped_nsobject<NSWindow> window(
44 [[[controller->view_controller() view] window] retain]); 43 [[[controller->view_controller() view] window] retain]);
45 EXPECT_TRUE([window isVisible]); 44 EXPECT_TRUE([window isVisible]);
46 45
47 // Press cancel to close the window 46 // Press cancel to close the window
48 [[controller->view_controller() cancelButton] performClick:nil]; 47 [[controller->view_controller() cancelButton] performClick:nil];
49 48
50 // Wait for the window to finish closing. 49 // Wait for the window to finish closing.
51 EXPECT_FALSE([window isVisible]); 50 EXPECT_FALSE([window isVisible]);
52 } 51 }
53 52
54 IN_PROC_BROWSER_TEST_F(ExtensionInstallDialogControllerTest, 53 IN_PROC_BROWSER_TEST_F(ExtensionInstallDialogControllerTest,
55 DISABLED_Permissions) { 54 DISABLED_Permissions) {
56 content::WebContents* tab = browser()->tab_strip_model()->GetWebContentsAt(0); 55 content::WebContents* tab = browser()->tab_strip_model()->GetWebContentsAt(0);
57 ExtensionInstallPromptShowParams show_params(tab); 56 ExtensionInstallPrompt::ShowParams show_params(tab);
58 57
59 chrome::MockExtensionInstallPromptDelegate delegate; 58 chrome::MockExtensionInstallPromptDelegate delegate;
60 scoped_refptr<ExtensionInstallPrompt::Prompt> prompt = 59 scoped_refptr<ExtensionInstallPrompt::Prompt> prompt =
61 chrome::BuildExtensionPostInstallPermissionsPrompt(extension_.get()); 60 chrome::BuildExtensionPostInstallPermissionsPrompt(extension_.get());
62 61
63 ExtensionInstallDialogController* controller = 62 ExtensionInstallDialogController* controller =
64 new ExtensionInstallDialogController(&show_params, 63 new ExtensionInstallDialogController(show_params,
65 &delegate, 64 &delegate,
66 prompt); 65 prompt);
67 66
68 base::scoped_nsobject<NSWindow> window( 67 base::scoped_nsobject<NSWindow> window(
69 [[[controller->view_controller() view] window] retain]); 68 [[[controller->view_controller() view] window] retain]);
70 EXPECT_TRUE([window isVisible]); 69 EXPECT_TRUE([window isVisible]);
71 70
72 // Press cancel to close the window 71 // Press cancel to close the window
73 [[controller->view_controller() cancelButton] performClick:nil]; 72 [[controller->view_controller() cancelButton] performClick:nil];
74 73
75 // Wait for the window to finish closing. 74 // Wait for the window to finish closing.
76 EXPECT_FALSE([window isVisible]); 75 EXPECT_FALSE([window isVisible]);
77 } 76 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698