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/ssl_client_certificate_selector_cocoa.h" | 5 #import "chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.h" |
6 | 6 |
7 #import <SecurityInterface/SFChooseIdentityPanel.h> | 7 #import <SecurityInterface/SFChooseIdentityPanel.h> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #import "base/mac/mac_util.h" | 10 #import "base/mac/mac_util.h" |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
43 content::WebContents* web_contents = | 43 content::WebContents* web_contents = |
44 browser()->tab_strip_model()->GetActiveWebContents(); | 44 browser()->tab_strip_model()->GetActiveWebContents(); |
45 WebContentsModalDialogManager* web_contents_modal_dialog_manager = | 45 WebContentsModalDialogManager* web_contents_modal_dialog_manager = |
46 WebContentsModalDialogManager::FromWebContents(web_contents); | 46 WebContentsModalDialogManager::FromWebContents(web_contents); |
47 EXPECT_FALSE(web_contents_modal_dialog_manager->IsDialogActive()); | 47 EXPECT_FALSE(web_contents_modal_dialog_manager->IsDialogActive()); |
48 | 48 |
49 net::X509Certificate* cert = NULL; | 49 net::X509Certificate* cert = NULL; |
50 int count = 0; | 50 int count = 0; |
51 SSLClientCertificateSelectorCocoa* selector = | 51 SSLClientCertificateSelectorCocoa* selector = |
52 [[SSLClientCertificateSelectorCocoa alloc] | 52 [[SSLClientCertificateSelectorCocoa alloc] |
53 initWithBrowserContext:web_contents->GetBrowserContext() | 53 initWithNetworkSession:auth_requestor_->http_network_session_ |
54 certRequestInfo:auth_requestor_->cert_request_info_.get() | 54 certRequestInfo:auth_requestor_->cert_request_info_.get() |
55 callback:base::Bind(&OnCertificateSelected, | 55 callback:base::Bind(&OnCertificateSelected, |
56 &cert, | 56 &cert, |
57 &count)]; | 57 &count)]; |
58 [selector displayForWebContents:web_contents]; | 58 [selector displayForWebContents:web_contents]; |
59 content::RunAllPendingInMessageLoop(); | 59 content::RunAllPendingInMessageLoop(); |
60 EXPECT_TRUE([selector panel]); | 60 EXPECT_TRUE([selector panel]); |
61 EXPECT_TRUE(web_contents_modal_dialog_manager->IsDialogActive()); | 61 EXPECT_TRUE(web_contents_modal_dialog_manager->IsDialogActive()); |
62 | 62 |
63 WebContentsModalDialogManager::TestApi test_api( | 63 WebContentsModalDialogManager::TestApi test_api( |
64 web_contents_modal_dialog_manager); | 64 web_contents_modal_dialog_manager); |
65 test_api.CloseAllDialogs(); | 65 test_api.CloseAllDialogs(); |
66 content::RunAllPendingInMessageLoop(); | 66 content::RunAllPendingInMessageLoop(); |
67 EXPECT_FALSE(web_contents_modal_dialog_manager->IsDialogActive()); | 67 EXPECT_FALSE(web_contents_modal_dialog_manager->IsDialogActive()); |
68 | 68 |
69 EXPECT_EQ(NULL, cert); | 69 EXPECT_EQ(NULL, cert); |
70 EXPECT_EQ(1, count); | 70 EXPECT_EQ(1, count); |
71 } | 71 } |
72 | 72 |
73 // Test that switching to another tab correctly hides the sheet. | 73 // Test that switching to another tab correctly hides the sheet. |
74 IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorCocoaTest, HideShow) { | 74 IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorCocoaTest, HideShow) { |
| 75 SSLClientCertificateSelectorCocoa* selector = |
| 76 [[SSLClientCertificateSelectorCocoa alloc] |
| 77 initWithNetworkSession:auth_requestor_->http_network_session_ |
| 78 certRequestInfo:auth_requestor_->cert_request_info_.get() |
| 79 callback:chrome::SelectCertificateCallback()]; |
75 content::WebContents* web_contents = | 80 content::WebContents* web_contents = |
76 browser()->tab_strip_model()->GetActiveWebContents(); | 81 browser()->tab_strip_model()->GetActiveWebContents(); |
77 SSLClientCertificateSelectorCocoa* selector = | |
78 [[SSLClientCertificateSelectorCocoa alloc] | |
79 initWithBrowserContext:web_contents->GetBrowserContext() | |
80 certRequestInfo:auth_requestor_->cert_request_info_.get() | |
81 callback:chrome::SelectCertificateCallback()]; | |
82 [selector displayForWebContents:web_contents]; | 82 [selector displayForWebContents:web_contents]; |
83 content::RunAllPendingInMessageLoop(); | 83 content::RunAllPendingInMessageLoop(); |
84 | 84 |
85 NSWindow* sheetWindow = [[selector overlayWindow] attachedSheet]; | 85 NSWindow* sheetWindow = [[selector overlayWindow] attachedSheet]; |
86 NSRect sheetFrame = [sheetWindow frame]; | 86 NSRect sheetFrame = [sheetWindow frame]; |
87 EXPECT_EQ(1.0, [sheetWindow alphaValue]); | 87 EXPECT_EQ(1.0, [sheetWindow alphaValue]); |
88 | 88 |
89 // Switch to another tab and verify that the sheet is hidden. | 89 // Switch to another tab and verify that the sheet is hidden. |
90 AddBlankTabAndShow(browser()); | 90 AddBlankTabAndShow(browser()); |
91 EXPECT_EQ(0.0, [sheetWindow alphaValue]); | 91 EXPECT_EQ(0.0, [sheetWindow alphaValue]); |
92 EXPECT_TRUE(NSEqualRects(ui::kWindowSizeDeterminedLater, | 92 EXPECT_TRUE(NSEqualRects(ui::kWindowSizeDeterminedLater, |
93 [sheetWindow frame])); | 93 [sheetWindow frame])); |
94 | 94 |
95 // Switch back and verify that the sheet is shown. | 95 // Switch back and verify that the sheet is shown. |
96 chrome::SelectNumberedTab(browser(), 0); | 96 chrome::SelectNumberedTab(browser(), 0); |
97 EXPECT_EQ(1.0, [sheetWindow alphaValue]); | 97 EXPECT_EQ(1.0, [sheetWindow alphaValue]); |
98 EXPECT_TRUE(NSEqualRects(sheetFrame, [sheetWindow frame])); | 98 EXPECT_TRUE(NSEqualRects(sheetFrame, [sheetWindow frame])); |
99 } | 99 } |
OLD | NEW |