Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(23)

Side by Side Diff: chrome/browser/ssl/ssl_client_certificate_selector_test.cc

Issue 2848313003: Revert of Remove client_certs from SSLCertRequestInfo. (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "chrome/browser/ssl/ssl_client_certificate_selector_test.h" 5 #include "chrome/browser/ssl/ssl_client_certificate_selector_test.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
11 #include "chrome/browser/ui/tabs/tab_strip_model.h" 11 #include "chrome/browser/ui/tabs/tab_strip_model.h"
12 #include "content/public/browser/browser_thread.h" 12 #include "content/public/browser/browser_thread.h"
13 #include "content/public/browser/web_contents.h" 13 #include "content/public/browser/web_contents.h"
14 #include "content/public/test/browser_test_utils.h" 14 #include "content/public/test/browser_test_utils.h"
15 #include "net/base/request_priority.h" 15 #include "net/base/request_priority.h"
16 #include "net/cert/x509_certificate.h"
16 #include "net/http/http_transaction_factory.h" 17 #include "net/http/http_transaction_factory.h"
17 #include "net/ssl/ssl_cert_request_info.h" 18 #include "net/ssl/ssl_cert_request_info.h"
19 #include "net/test/cert_test_util.h"
20 #include "net/test/test_data_directory.h"
18 #include "net/traffic_annotation/network_traffic_annotation_test_helper.h" 21 #include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
19 #include "net/url_request/url_request.h" 22 #include "net/url_request/url_request.h"
20 #include "net/url_request/url_request_context.h" 23 #include "net/url_request/url_request_context.h"
21 #include "net/url_request/url_request_context_getter.h" 24 #include "net/url_request/url_request_context_getter.h"
22 25
23 using ::testing::Mock; 26 using ::testing::Mock;
24 using ::testing::StrictMock; 27 using ::testing::StrictMock;
25 using content::BrowserThread; 28 using content::BrowserThread;
26 29
27 SSLClientCertificateSelectorTestBase::SSLClientCertificateSelectorTestBase() 30 SSLClientCertificateSelectorTestBase::SSLClientCertificateSelectorTestBase()
28 : io_loop_finished_event_(base::WaitableEvent::ResetPolicy::AUTOMATIC, 31 : io_loop_finished_event_(base::WaitableEvent::ResetPolicy::AUTOMATIC,
29 base::WaitableEvent::InitialState::NOT_SIGNALED) { 32 base::WaitableEvent::InitialState::NOT_SIGNALED) {
30 } 33 }
31 34
32 SSLClientCertificateSelectorTestBase::~SSLClientCertificateSelectorTestBase() { 35 SSLClientCertificateSelectorTestBase::~SSLClientCertificateSelectorTestBase() {
33 } 36 }
34 37
35 void SSLClientCertificateSelectorTestBase::SetUpInProcessBrowserTestFixture() { 38 void SSLClientCertificateSelectorTestBase::SetUpInProcessBrowserTestFixture() {
39 base::FilePath certs_dir = net::GetTestCertsDirectory();
40
41 mit_davidben_cert_ = net::ImportCertFromFile(certs_dir, "mit.davidben.der");
42 ASSERT_TRUE(mit_davidben_cert_.get());
43
44 foaf_me_chromium_test_cert_ = net::ImportCertFromFile(
45 certs_dir, "foaf.me.chromium-test-cert.der");
46 ASSERT_TRUE(foaf_me_chromium_test_cert_.get());
47
36 cert_request_info_ = new net::SSLCertRequestInfo; 48 cert_request_info_ = new net::SSLCertRequestInfo;
37 cert_request_info_->host_and_port = net::HostPortPair("foo", 123); 49 cert_request_info_->host_and_port = net::HostPortPair("foo", 123);
50 cert_request_info_->client_certs.push_back(mit_davidben_cert_);
51 cert_request_info_->client_certs.push_back(foaf_me_chromium_test_cert_);
38 } 52 }
39 53
40 void SSLClientCertificateSelectorTestBase::SetUpOnMainThread() { 54 void SSLClientCertificateSelectorTestBase::SetUpOnMainThread() {
41 url_request_context_getter_ = browser()->profile()->GetRequestContext(); 55 url_request_context_getter_ = browser()->profile()->GetRequestContext();
42 56
43 BrowserThread::PostTask( 57 BrowserThread::PostTask(
44 BrowserThread::IO, 58 BrowserThread::IO,
45 FROM_HERE, 59 FROM_HERE,
46 base::Bind(&SSLClientCertificateSelectorTestBase::SetUpOnIOThread, 60 base::Bind(&SSLClientCertificateSelectorTestBase::SetUpOnIOThread,
47 base::Unretained(this))); 61 base::Unretained(this)));
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 97
84 std::unique_ptr<net::URLRequest> 98 std::unique_ptr<net::URLRequest>
85 SSLClientCertificateSelectorTestBase::MakeURLRequest( 99 SSLClientCertificateSelectorTestBase::MakeURLRequest(
86 net::URLRequestContextGetter* context_getter) { 100 net::URLRequestContextGetter* context_getter) {
87 std::unique_ptr<net::URLRequest> request = 101 std::unique_ptr<net::URLRequest> request =
88 context_getter->GetURLRequestContext()->CreateRequest( 102 context_getter->GetURLRequestContext()->CreateRequest(
89 GURL("https://example"), net::DEFAULT_PRIORITY, NULL, 103 GURL("https://example"), net::DEFAULT_PRIORITY, NULL,
90 TRAFFIC_ANNOTATION_FOR_TESTS); 104 TRAFFIC_ANNOTATION_FOR_TESTS);
91 return request; 105 return request;
92 } 106 }
OLDNEW
« no previous file with comments | « chrome/browser/ssl/ssl_client_certificate_selector_test.h ('k') | chrome/browser/ui/android/ssl_client_certificate_request.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698