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 #include "base/bind.h" | 5 #include "base/bind.h" |
6 #include "base/files/file_path.h" | 6 #include "base/files/file_path.h" |
7 #include "base/synchronization/waitable_event.h" | 7 #include "base/synchronization/waitable_event.h" |
8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
9 #include "chrome/browser/ssl/ssl_client_auth_requestor_mock.h" | 9 #include "chrome/browser/ssl/ssl_client_auth_requestor_mock.h" |
10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
66 BrowserThread::PostTask( | 66 BrowserThread::PostTask( |
67 BrowserThread::IO, FROM_HERE, | 67 BrowserThread::IO, FROM_HERE, |
68 base::Bind(&SSLClientCertificateSelectorTest::SetUpOnIOThread, this)); | 68 base::Bind(&SSLClientCertificateSelectorTest::SetUpOnIOThread, this)); |
69 | 69 |
70 io_loop_finished_event_.Wait(); | 70 io_loop_finished_event_.Wait(); |
71 | 71 |
72 content::WaitForLoadStop( | 72 content::WaitForLoadStop( |
73 browser()->tab_strip_model()->GetActiveWebContents()); | 73 browser()->tab_strip_model()->GetActiveWebContents()); |
74 selector_ = new SSLClientCertificateSelector( | 74 selector_ = new SSLClientCertificateSelector( |
75 browser()->tab_strip_model()->GetActiveWebContents(), | 75 browser()->tab_strip_model()->GetActiveWebContents(), |
| 76 auth_requestor_->http_network_session_, |
76 auth_requestor_->cert_request_info_, | 77 auth_requestor_->cert_request_info_, |
77 base::Bind(&SSLClientAuthRequestorMock::CertificateSelected, | 78 base::Bind(&SSLClientAuthRequestorMock::CertificateSelected, |
78 auth_requestor_)); | 79 auth_requestor_)); |
79 selector_->Init(); | 80 selector_->Init(); |
80 | 81 |
81 EXPECT_EQ(mit_davidben_cert_.get(), selector_->GetSelectedCert()); | 82 EXPECT_EQ(mit_davidben_cert_.get(), selector_->GetSelectedCert()); |
82 } | 83 } |
83 | 84 |
84 virtual void SetUpOnIOThread() { | 85 virtual void SetUpOnIOThread() { |
85 url_request_ = MakeURLRequest(url_request_context_getter_.get()).release(); | 86 url_request_ = MakeURLRequest(url_request_context_getter_.get()).release(); |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
153 AddTabAtIndex(1, GURL("about:blank"), ui::PAGE_TRANSITION_LINK); | 154 AddTabAtIndex(1, GURL("about:blank"), ui::PAGE_TRANSITION_LINK); |
154 AddTabAtIndex(2, GURL("about:blank"), ui::PAGE_TRANSITION_LINK); | 155 AddTabAtIndex(2, GURL("about:blank"), ui::PAGE_TRANSITION_LINK); |
155 ASSERT_TRUE(NULL != browser()->tab_strip_model()->GetWebContentsAt(0)); | 156 ASSERT_TRUE(NULL != browser()->tab_strip_model()->GetWebContentsAt(0)); |
156 ASSERT_TRUE(NULL != browser()->tab_strip_model()->GetWebContentsAt(1)); | 157 ASSERT_TRUE(NULL != browser()->tab_strip_model()->GetWebContentsAt(1)); |
157 ASSERT_TRUE(NULL != browser()->tab_strip_model()->GetWebContentsAt(2)); | 158 ASSERT_TRUE(NULL != browser()->tab_strip_model()->GetWebContentsAt(2)); |
158 content::WaitForLoadStop(browser()->tab_strip_model()->GetWebContentsAt(1)); | 159 content::WaitForLoadStop(browser()->tab_strip_model()->GetWebContentsAt(1)); |
159 content::WaitForLoadStop(browser()->tab_strip_model()->GetWebContentsAt(2)); | 160 content::WaitForLoadStop(browser()->tab_strip_model()->GetWebContentsAt(2)); |
160 | 161 |
161 selector_1_ = new SSLClientCertificateSelector( | 162 selector_1_ = new SSLClientCertificateSelector( |
162 browser()->tab_strip_model()->GetWebContentsAt(1), | 163 browser()->tab_strip_model()->GetWebContentsAt(1), |
| 164 auth_requestor_1_->http_network_session_, |
163 auth_requestor_1_->cert_request_info_, | 165 auth_requestor_1_->cert_request_info_, |
164 base::Bind(&SSLClientAuthRequestorMock::CertificateSelected, | 166 base::Bind(&SSLClientAuthRequestorMock::CertificateSelected, |
165 auth_requestor_1_)); | 167 auth_requestor_1_)); |
166 selector_1_->Init(); | 168 selector_1_->Init(); |
167 selector_2_ = new SSLClientCertificateSelector( | 169 selector_2_ = new SSLClientCertificateSelector( |
168 browser()->tab_strip_model()->GetWebContentsAt(2), | 170 browser()->tab_strip_model()->GetWebContentsAt(2), |
| 171 auth_requestor_2_->http_network_session_, |
169 auth_requestor_2_->cert_request_info_, | 172 auth_requestor_2_->cert_request_info_, |
170 base::Bind(&SSLClientAuthRequestorMock::CertificateSelected, | 173 base::Bind(&SSLClientAuthRequestorMock::CertificateSelected, |
171 auth_requestor_2_)); | 174 auth_requestor_2_)); |
172 selector_2_->Init(); | 175 selector_2_->Init(); |
173 | 176 |
174 EXPECT_EQ(2, browser()->tab_strip_model()->active_index()); | 177 EXPECT_EQ(2, browser()->tab_strip_model()->active_index()); |
175 EXPECT_EQ(mit_davidben_cert_.get(), selector_1_->GetSelectedCert()); | 178 EXPECT_EQ(mit_davidben_cert_.get(), selector_1_->GetSelectedCert()); |
176 EXPECT_EQ(mit_davidben_cert_.get(), selector_2_->GetSelectedCert()); | 179 EXPECT_EQ(mit_davidben_cert_.get(), selector_2_->GetSelectedCert()); |
177 } | 180 } |
178 | 181 |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
229 | 232 |
230 void SetUpOnMainThread() override { | 233 void SetUpOnMainThread() override { |
231 browser_1_ = CreateIncognitoBrowser(); | 234 browser_1_ = CreateIncognitoBrowser(); |
232 url_request_context_getter_1_ = browser_1_->profile()->GetRequestContext(); | 235 url_request_context_getter_1_ = browser_1_->profile()->GetRequestContext(); |
233 | 236 |
234 // Also calls SetUpOnIOThread. | 237 // Also calls SetUpOnIOThread. |
235 SSLClientCertificateSelectorTest::SetUpOnMainThread(); | 238 SSLClientCertificateSelectorTest::SetUpOnMainThread(); |
236 | 239 |
237 selector_1_ = new SSLClientCertificateSelector( | 240 selector_1_ = new SSLClientCertificateSelector( |
238 browser_1_->tab_strip_model()->GetActiveWebContents(), | 241 browser_1_->tab_strip_model()->GetActiveWebContents(), |
| 242 auth_requestor_1_->http_network_session_, |
239 auth_requestor_1_->cert_request_info_, | 243 auth_requestor_1_->cert_request_info_, |
240 base::Bind(&SSLClientAuthRequestorMock::CertificateSelected, | 244 base::Bind(&SSLClientAuthRequestorMock::CertificateSelected, |
241 auth_requestor_1_)); | 245 auth_requestor_1_)); |
242 selector_1_->Init(); | 246 selector_1_->Init(); |
243 | 247 |
244 EXPECT_EQ(mit_davidben_cert_.get(), selector_1_->GetSelectedCert()); | 248 EXPECT_EQ(mit_davidben_cert_.get(), selector_1_->GetSelectedCert()); |
245 } | 249 } |
246 | 250 |
247 void SetUpOnIOThread() override { | 251 void SetUpOnIOThread() override { |
248 url_request_1_ = | 252 url_request_1_ = |
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
386 EXPECT_TRUE(ui_test_utils::SendKeyPressSync( | 390 EXPECT_TRUE(ui_test_utils::SendKeyPressSync( |
387 browser_1_, ui::VKEY_RETURN, false, false, false, false)); | 391 browser_1_, ui::VKEY_RETURN, false, false, false, false)); |
388 | 392 |
389 Mock::VerifyAndClear(auth_requestor_.get()); | 393 Mock::VerifyAndClear(auth_requestor_.get()); |
390 Mock::VerifyAndClear(auth_requestor_1_.get()); | 394 Mock::VerifyAndClear(auth_requestor_1_.get()); |
391 | 395 |
392 // Now let the default selection for auth_requestor_ mock get checked on | 396 // Now let the default selection for auth_requestor_ mock get checked on |
393 // destruction. | 397 // destruction. |
394 EXPECT_CALL(*auth_requestor_.get(), CertificateSelected(NULL)); | 398 EXPECT_CALL(*auth_requestor_.get(), CertificateSelected(NULL)); |
395 } | 399 } |
OLD | NEW |