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" |
| 11 #include "base/macros.h" |
11 #include "chrome/browser/ssl/ssl_client_certificate_selector.h" | 12 #include "chrome/browser/ssl/ssl_client_certificate_selector.h" |
12 #include "chrome/browser/ssl/ssl_client_certificate_selector_test.h" | 13 #include "chrome/browser/ssl/ssl_client_certificate_selector_test.h" |
13 #include "chrome/browser/ui/browser.h" | 14 #include "chrome/browser/ui/browser.h" |
14 #include "chrome/browser/ui/browser_commands.h" | 15 #include "chrome/browser/ui/browser_commands.h" |
15 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 16 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
16 #include "components/web_modal/web_contents_modal_dialog_manager.h" | 17 #include "components/web_modal/web_contents_modal_dialog_manager.h" |
| 18 #include "content/public/browser/client_certificate_delegate.h" |
17 #include "content/public/browser/web_contents.h" | 19 #include "content/public/browser/web_contents.h" |
18 #include "content/public/test/test_utils.h" | 20 #include "content/public/test/test_utils.h" |
19 #include "ui/base/cocoa/window_size_constants.h" | 21 #include "ui/base/cocoa/window_size_constants.h" |
20 | 22 |
21 using web_modal::WebContentsModalDialogManager; | 23 using web_modal::WebContentsModalDialogManager; |
22 | 24 |
23 namespace { | 25 namespace { |
24 | 26 |
25 void OnCertificateSelected(net::X509Certificate** out_cert, | 27 class TestClientCertificateDelegate |
26 int* out_count, | 28 : public content::ClientCertificateDelegate { |
27 net::X509Certificate* cert) { | 29 public: |
28 *out_cert = cert; | 30 // Creates a ClientCertificateDelegate that sets |*destroyed| to true on |
29 ++(*out_count); | 31 // destruction. |
30 } | 32 explicit TestClientCertificateDelegate(bool* destroyed) |
| 33 : destroyed_(destroyed) {} |
| 34 |
| 35 ~TestClientCertificateDelegate() override { |
| 36 if (destroyed_ != nullptr) |
| 37 *destroyed_ = true; |
| 38 } |
| 39 |
| 40 // content::ClientCertificateDelegate. |
| 41 void ContinueWithCertificate(net::X509Certificate* cert) override { |
| 42 // TODO(davidben): Add a test which explicitly tests selecting a |
| 43 // certificate, or selecting no certificate, since closing the dialog |
| 44 // (normally by closing the tab) is not the same as explicitly selecting no |
| 45 // certificate. |
| 46 ADD_FAILURE() << "Certificate selected"; |
| 47 } |
| 48 |
| 49 private: |
| 50 bool* destroyed_; |
| 51 |
| 52 DISALLOW_COPY_AND_ASSIGN(TestClientCertificateDelegate); |
| 53 }; |
31 | 54 |
32 } // namespace | 55 } // namespace |
33 | 56 |
34 typedef SSLClientCertificateSelectorTestBase | 57 typedef SSLClientCertificateSelectorTestBase |
35 SSLClientCertificateSelectorCocoaTest; | 58 SSLClientCertificateSelectorCocoaTest; |
36 | 59 |
37 // Flaky on 10.7; crbug.com/313243 | 60 // Flaky on 10.7; crbug.com/313243 |
38 IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorCocoaTest, DISABLED_Basic) { | 61 IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorCocoaTest, DISABLED_Basic) { |
39 // TODO(kbr): re-enable: http://crbug.com/222296 | 62 // TODO(kbr): re-enable: http://crbug.com/222296 |
40 if (base::mac::IsOSMountainLionOrLater()) | 63 if (base::mac::IsOSMountainLionOrLater()) |
41 return; | 64 return; |
42 | 65 |
43 content::WebContents* web_contents = | 66 content::WebContents* web_contents = |
44 browser()->tab_strip_model()->GetActiveWebContents(); | 67 browser()->tab_strip_model()->GetActiveWebContents(); |
45 WebContentsModalDialogManager* web_contents_modal_dialog_manager = | 68 WebContentsModalDialogManager* web_contents_modal_dialog_manager = |
46 WebContentsModalDialogManager::FromWebContents(web_contents); | 69 WebContentsModalDialogManager::FromWebContents(web_contents); |
47 EXPECT_FALSE(web_contents_modal_dialog_manager->IsDialogActive()); | 70 EXPECT_FALSE(web_contents_modal_dialog_manager->IsDialogActive()); |
48 | 71 |
49 net::X509Certificate* cert = NULL; | 72 bool destroyed = false; |
50 int count = 0; | 73 SSLClientCertificateSelectorCocoa* selector = [ |
51 SSLClientCertificateSelectorCocoa* selector = | 74 [SSLClientCertificateSelectorCocoa alloc] |
52 [[SSLClientCertificateSelectorCocoa alloc] | 75 initWithBrowserContext:web_contents->GetBrowserContext() |
53 initWithBrowserContext:web_contents->GetBrowserContext() | 76 certRequestInfo:auth_requestor_->cert_request_info_.get() |
54 certRequestInfo:auth_requestor_->cert_request_info_.get() | 77 delegate:make_scoped_ptr(new TestClientCertificateDelegate( |
55 callback:base::Bind(&OnCertificateSelected, | 78 &destroyed))]; |
56 &cert, | |
57 &count)]; | |
58 [selector displayForWebContents:web_contents]; | 79 [selector displayForWebContents:web_contents]; |
59 content::RunAllPendingInMessageLoop(); | 80 content::RunAllPendingInMessageLoop(); |
60 EXPECT_TRUE([selector panel]); | 81 EXPECT_TRUE([selector panel]); |
61 EXPECT_TRUE(web_contents_modal_dialog_manager->IsDialogActive()); | 82 EXPECT_TRUE(web_contents_modal_dialog_manager->IsDialogActive()); |
62 | 83 |
63 WebContentsModalDialogManager::TestApi test_api( | 84 WebContentsModalDialogManager::TestApi test_api( |
64 web_contents_modal_dialog_manager); | 85 web_contents_modal_dialog_manager); |
65 test_api.CloseAllDialogs(); | 86 test_api.CloseAllDialogs(); |
66 content::RunAllPendingInMessageLoop(); | 87 content::RunAllPendingInMessageLoop(); |
67 EXPECT_FALSE(web_contents_modal_dialog_manager->IsDialogActive()); | 88 EXPECT_FALSE(web_contents_modal_dialog_manager->IsDialogActive()); |
68 | 89 |
69 EXPECT_EQ(NULL, cert); | 90 EXPECT_TRUE(destroyed); |
70 EXPECT_EQ(1, count); | |
71 } | 91 } |
72 | 92 |
73 // Test that switching to another tab correctly hides the sheet. | 93 // Test that switching to another tab correctly hides the sheet. |
74 IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorCocoaTest, HideShow) { | 94 IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorCocoaTest, HideShow) { |
75 content::WebContents* web_contents = | 95 content::WebContents* web_contents = |
76 browser()->tab_strip_model()->GetActiveWebContents(); | 96 browser()->tab_strip_model()->GetActiveWebContents(); |
77 SSLClientCertificateSelectorCocoa* selector = | 97 SSLClientCertificateSelectorCocoa* selector = [ |
78 [[SSLClientCertificateSelectorCocoa alloc] | 98 [SSLClientCertificateSelectorCocoa alloc] |
79 initWithBrowserContext:web_contents->GetBrowserContext() | 99 initWithBrowserContext:web_contents->GetBrowserContext() |
80 certRequestInfo:auth_requestor_->cert_request_info_.get() | 100 certRequestInfo:auth_requestor_->cert_request_info_.get() |
81 callback:chrome::SelectCertificateCallback()]; | 101 delegate:make_scoped_ptr( |
| 102 new TestClientCertificateDelegate(nullptr))]; |
82 [selector displayForWebContents:web_contents]; | 103 [selector displayForWebContents:web_contents]; |
83 content::RunAllPendingInMessageLoop(); | 104 content::RunAllPendingInMessageLoop(); |
84 | 105 |
85 NSWindow* sheetWindow = [[selector overlayWindow] attachedSheet]; | 106 NSWindow* sheetWindow = [[selector overlayWindow] attachedSheet]; |
86 NSRect sheetFrame = [sheetWindow frame]; | 107 NSRect sheetFrame = [sheetWindow frame]; |
87 EXPECT_EQ(1.0, [sheetWindow alphaValue]); | 108 EXPECT_EQ(1.0, [sheetWindow alphaValue]); |
88 | 109 |
89 // Switch to another tab and verify that the sheet is hidden. | 110 // Switch to another tab and verify that the sheet is hidden. |
90 AddBlankTabAndShow(browser()); | 111 AddBlankTabAndShow(browser()); |
91 EXPECT_EQ(0.0, [sheetWindow alphaValue]); | 112 EXPECT_EQ(0.0, [sheetWindow alphaValue]); |
92 EXPECT_TRUE(NSEqualRects(ui::kWindowSizeDeterminedLater, | 113 EXPECT_TRUE(NSEqualRects(ui::kWindowSizeDeterminedLater, |
93 [sheetWindow frame])); | 114 [sheetWindow frame])); |
94 | 115 |
95 // Switch back and verify that the sheet is shown. | 116 // Switch back and verify that the sheet is shown. |
96 chrome::SelectNumberedTab(browser(), 0); | 117 chrome::SelectNumberedTab(browser(), 0); |
97 EXPECT_EQ(1.0, [sheetWindow alphaValue]); | 118 EXPECT_EQ(1.0, [sheetWindow alphaValue]); |
98 EXPECT_TRUE(NSEqualRects(sheetFrame, [sheetWindow frame])); | 119 EXPECT_TRUE(NSEqualRects(sheetFrame, [sheetWindow frame])); |
99 } | 120 } |
OLD | NEW |