| 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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 cert_request_info_2_ = new net::SSLCertRequestInfo; | 144 cert_request_info_2_ = new net::SSLCertRequestInfo; |
| 145 cert_request_info_2_->host_and_port = net::HostPortPair("bar", 123); | 145 cert_request_info_2_->host_and_port = net::HostPortPair("bar", 123); |
| 146 cert_request_info_2_->client_certs.push_back(mit_davidben_cert_); | 146 cert_request_info_2_->client_certs.push_back(mit_davidben_cert_); |
| 147 cert_request_info_2_->client_certs.push_back(foaf_me_chromium_test_cert_); | 147 cert_request_info_2_->client_certs.push_back(foaf_me_chromium_test_cert_); |
| 148 } | 148 } |
| 149 | 149 |
| 150 virtual void SetUpOnMainThread() OVERRIDE { | 150 virtual void SetUpOnMainThread() OVERRIDE { |
| 151 // Also calls SetUpOnIOThread. | 151 // Also calls SetUpOnIOThread. |
| 152 SSLClientCertificateSelectorTest::SetUpOnMainThread(); | 152 SSLClientCertificateSelectorTest::SetUpOnMainThread(); |
| 153 | 153 |
| 154 AddTabAtIndex(1, GURL("about:blank"), content::PAGE_TRANSITION_LINK); | 154 AddTabAtIndex(1, GURL("about:blank"), ui::PAGE_TRANSITION_LINK); |
| 155 AddTabAtIndex(2, GURL("about:blank"), content::PAGE_TRANSITION_LINK); | 155 AddTabAtIndex(2, GURL("about:blank"), ui::PAGE_TRANSITION_LINK); |
| 156 ASSERT_TRUE(NULL != browser()->tab_strip_model()->GetWebContentsAt(0)); | 156 ASSERT_TRUE(NULL != browser()->tab_strip_model()->GetWebContentsAt(0)); |
| 157 ASSERT_TRUE(NULL != browser()->tab_strip_model()->GetWebContentsAt(1)); | 157 ASSERT_TRUE(NULL != browser()->tab_strip_model()->GetWebContentsAt(1)); |
| 158 ASSERT_TRUE(NULL != browser()->tab_strip_model()->GetWebContentsAt(2)); | 158 ASSERT_TRUE(NULL != browser()->tab_strip_model()->GetWebContentsAt(2)); |
| 159 content::WaitForLoadStop(browser()->tab_strip_model()->GetWebContentsAt(1)); | 159 content::WaitForLoadStop(browser()->tab_strip_model()->GetWebContentsAt(1)); |
| 160 content::WaitForLoadStop(browser()->tab_strip_model()->GetWebContentsAt(2)); | 160 content::WaitForLoadStop(browser()->tab_strip_model()->GetWebContentsAt(2)); |
| 161 | 161 |
| 162 selector_1_ = new SSLClientCertificateSelector( | 162 selector_1_ = new SSLClientCertificateSelector( |
| 163 browser()->tab_strip_model()->GetWebContentsAt(1), | 163 browser()->tab_strip_model()->GetWebContentsAt(1), |
| 164 auth_requestor_1_->http_network_session_, | 164 auth_requestor_1_->http_network_session_, |
| 165 auth_requestor_1_->cert_request_info_, | 165 auth_requestor_1_->cert_request_info_, |
| (...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 390 EXPECT_TRUE(ui_test_utils::SendKeyPressSync( | 390 EXPECT_TRUE(ui_test_utils::SendKeyPressSync( |
| 391 browser_1_, ui::VKEY_RETURN, false, false, false, false)); | 391 browser_1_, ui::VKEY_RETURN, false, false, false, false)); |
| 392 | 392 |
| 393 Mock::VerifyAndClear(auth_requestor_.get()); | 393 Mock::VerifyAndClear(auth_requestor_.get()); |
| 394 Mock::VerifyAndClear(auth_requestor_1_.get()); | 394 Mock::VerifyAndClear(auth_requestor_1_.get()); |
| 395 | 395 |
| 396 // 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 |
| 397 // destruction. | 397 // destruction. |
| 398 EXPECT_CALL(*auth_requestor_.get(), CertificateSelected(NULL)); | 398 EXPECT_CALL(*auth_requestor_.get(), CertificateSelected(NULL)); |
| 399 } | 399 } |
| OLD | NEW |