OLD | NEW |
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 <utility> | 7 #include <utility> |
8 | 8 |
9 #include "chrome/browser/extensions/extension_install_prompt_show_params.h" | 9 #include "chrome/browser/extensions/extension_install_prompt_show_params.h" |
10 #include "chrome/browser/extensions/extension_install_prompt_test_helper.h" | 10 #include "chrome/browser/extensions/extension_install_prompt_test_helper.h" |
(...skipping 17 matching lines...) Expand all Loading... |
28 | 28 |
29 protected: | 29 protected: |
30 scoped_refptr<Extension> extension_; | 30 scoped_refptr<Extension> extension_; |
31 }; | 31 }; |
32 | 32 |
33 IN_PROC_BROWSER_TEST_F(ExtensionInstallDialogControllerTest, BasicTest) { | 33 IN_PROC_BROWSER_TEST_F(ExtensionInstallDialogControllerTest, BasicTest) { |
34 content::WebContents* tab = browser()->tab_strip_model()->GetWebContentsAt(0); | 34 content::WebContents* tab = browser()->tab_strip_model()->GetWebContentsAt(0); |
35 ExtensionInstallPromptShowParams show_params(tab); | 35 ExtensionInstallPromptShowParams show_params(tab); |
36 | 36 |
37 ExtensionInstallPromptTestHelper test_helper; | 37 ExtensionInstallPromptTestHelper test_helper; |
38 scoped_ptr<ExtensionInstallPrompt::Prompt> prompt = | 38 std::unique_ptr<ExtensionInstallPrompt::Prompt> prompt = |
39 chrome::BuildExtensionInstallPrompt(extension_.get()); | 39 chrome::BuildExtensionInstallPrompt(extension_.get()); |
40 | 40 |
41 ExtensionInstallDialogController* controller = | 41 ExtensionInstallDialogController* controller = |
42 new ExtensionInstallDialogController( | 42 new ExtensionInstallDialogController( |
43 &show_params, test_helper.GetCallback(), std::move(prompt)); | 43 &show_params, test_helper.GetCallback(), std::move(prompt)); |
44 | 44 |
45 base::scoped_nsobject<NSWindow> window( | 45 base::scoped_nsobject<NSWindow> window( |
46 [[[controller->view_controller() view] window] retain]); | 46 [[[controller->view_controller() view] window] retain]); |
47 EXPECT_TRUE([window isVisible]); | 47 EXPECT_TRUE([window isVisible]); |
48 | 48 |
49 // Press cancel to close the window. | 49 // Press cancel to close the window. |
50 [[controller->view_controller() cancelButton] performClick:nil]; | 50 [[controller->view_controller() cancelButton] performClick:nil]; |
51 | 51 |
52 // Wait for the window to finish closing. | 52 // Wait for the window to finish closing. |
53 EXPECT_FALSE([window isVisible]); | 53 EXPECT_FALSE([window isVisible]); |
54 | 54 |
55 EXPECT_EQ(ExtensionInstallPrompt::Result::USER_CANCELED, | 55 EXPECT_EQ(ExtensionInstallPrompt::Result::USER_CANCELED, |
56 test_helper.result()); | 56 test_helper.result()); |
57 } | 57 } |
58 | 58 |
59 IN_PROC_BROWSER_TEST_F(ExtensionInstallDialogControllerTest, | 59 IN_PROC_BROWSER_TEST_F(ExtensionInstallDialogControllerTest, |
60 DISABLED_Permissions) { | 60 DISABLED_Permissions) { |
61 content::WebContents* tab = browser()->tab_strip_model()->GetWebContentsAt(0); | 61 content::WebContents* tab = browser()->tab_strip_model()->GetWebContentsAt(0); |
62 ExtensionInstallPromptShowParams show_params(tab); | 62 ExtensionInstallPromptShowParams show_params(tab); |
63 | 63 |
64 ExtensionInstallPromptTestHelper test_helper; | 64 ExtensionInstallPromptTestHelper test_helper; |
65 scoped_ptr<ExtensionInstallPrompt::Prompt> prompt = | 65 std::unique_ptr<ExtensionInstallPrompt::Prompt> prompt = |
66 chrome::BuildExtensionPostInstallPermissionsPrompt(extension_.get()); | 66 chrome::BuildExtensionPostInstallPermissionsPrompt(extension_.get()); |
67 | 67 |
68 ExtensionInstallDialogController* controller = | 68 ExtensionInstallDialogController* controller = |
69 new ExtensionInstallDialogController( | 69 new ExtensionInstallDialogController( |
70 &show_params, test_helper.GetCallback(), std::move(prompt)); | 70 &show_params, test_helper.GetCallback(), std::move(prompt)); |
71 | 71 |
72 base::scoped_nsobject<NSWindow> window( | 72 base::scoped_nsobject<NSWindow> window( |
73 [[[controller->view_controller() view] window] retain]); | 73 [[[controller->view_controller() view] window] retain]); |
74 EXPECT_TRUE([window isVisible]); | 74 EXPECT_TRUE([window isVisible]); |
75 | 75 |
76 // Press cancel to close the window. | 76 // Press cancel to close the window. |
77 [[controller->view_controller() cancelButton] performClick:nil]; | 77 [[controller->view_controller() cancelButton] performClick:nil]; |
78 | 78 |
79 // Wait for the window to finish closing. | 79 // Wait for the window to finish closing. |
80 EXPECT_FALSE([window isVisible]); | 80 EXPECT_FALSE([window isVisible]); |
81 | 81 |
82 EXPECT_EQ(ExtensionInstallPrompt::Result::USER_CANCELED, | 82 EXPECT_EQ(ExtensionInstallPrompt::Result::USER_CANCELED, |
83 test_helper.result()); | 83 test_helper.result()); |
84 } | 84 } |
OLD | NEW |