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

Unified 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, 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ssl/ssl_client_certificate_selector_test.cc
diff --git a/chrome/browser/ssl/ssl_client_certificate_selector_test.cc b/chrome/browser/ssl/ssl_client_certificate_selector_test.cc
index e0362ea6471a392ef1c5505624bf5a7db49ce913..7e247e72999c88ce8186416991a8a2abfe0f66e5 100644
--- a/chrome/browser/ssl/ssl_client_certificate_selector_test.cc
+++ b/chrome/browser/ssl/ssl_client_certificate_selector_test.cc
@@ -13,8 +13,11 @@
#include "content/public/browser/web_contents.h"
#include "content/public/test/browser_test_utils.h"
#include "net/base/request_priority.h"
+#include "net/cert/x509_certificate.h"
#include "net/http/http_transaction_factory.h"
#include "net/ssl/ssl_cert_request_info.h"
+#include "net/test/cert_test_util.h"
+#include "net/test/test_data_directory.h"
#include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_context.h"
@@ -33,8 +36,19 @@
}
void SSLClientCertificateSelectorTestBase::SetUpInProcessBrowserTestFixture() {
+ base::FilePath certs_dir = net::GetTestCertsDirectory();
+
+ mit_davidben_cert_ = net::ImportCertFromFile(certs_dir, "mit.davidben.der");
+ ASSERT_TRUE(mit_davidben_cert_.get());
+
+ foaf_me_chromium_test_cert_ = net::ImportCertFromFile(
+ certs_dir, "foaf.me.chromium-test-cert.der");
+ ASSERT_TRUE(foaf_me_chromium_test_cert_.get());
+
cert_request_info_ = new net::SSLCertRequestInfo;
cert_request_info_->host_and_port = net::HostPortPair("foo", 123);
+ cert_request_info_->client_certs.push_back(mit_davidben_cert_);
+ cert_request_info_->client_certs.push_back(foaf_me_chromium_test_cert_);
}
void SSLClientCertificateSelectorTestBase::SetUpOnMainThread() {
« 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