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 "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/cert/x509_certificate.h" |
17 #include "net/http/http_transaction_factory.h" | 17 #include "net/http/http_transaction_factory.h" |
18 #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" | 19 #include "net/test/cert_test_util.h" |
20 #include "net/test/test_data_directory.h" | 20 #include "net/test/test_data_directory.h" |
| 21 #include "net/traffic_annotation/network_traffic_annotation_test_helper.h" |
21 #include "net/url_request/url_request.h" | 22 #include "net/url_request/url_request.h" |
22 #include "net/url_request/url_request_context.h" | 23 #include "net/url_request/url_request_context.h" |
23 #include "net/url_request/url_request_context_getter.h" | 24 #include "net/url_request/url_request_context_getter.h" |
24 | 25 |
25 using ::testing::Mock; | 26 using ::testing::Mock; |
26 using ::testing::StrictMock; | 27 using ::testing::StrictMock; |
27 using content::BrowserThread; | 28 using content::BrowserThread; |
28 | 29 |
29 SSLClientCertificateSelectorTestBase::SSLClientCertificateSelectorTestBase() | 30 SSLClientCertificateSelectorTestBase::SSLClientCertificateSelectorTestBase() |
30 : io_loop_finished_event_(base::WaitableEvent::ResetPolicy::AUTOMATIC, | 31 : io_loop_finished_event_(base::WaitableEvent::ResetPolicy::AUTOMATIC, |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
92 delete url_request_; | 93 delete url_request_; |
93 | 94 |
94 io_loop_finished_event_.Signal(); | 95 io_loop_finished_event_.Signal(); |
95 } | 96 } |
96 | 97 |
97 std::unique_ptr<net::URLRequest> | 98 std::unique_ptr<net::URLRequest> |
98 SSLClientCertificateSelectorTestBase::MakeURLRequest( | 99 SSLClientCertificateSelectorTestBase::MakeURLRequest( |
99 net::URLRequestContextGetter* context_getter) { | 100 net::URLRequestContextGetter* context_getter) { |
100 std::unique_ptr<net::URLRequest> request = | 101 std::unique_ptr<net::URLRequest> request = |
101 context_getter->GetURLRequestContext()->CreateRequest( | 102 context_getter->GetURLRequestContext()->CreateRequest( |
102 GURL("https://example"), net::DEFAULT_PRIORITY, NULL); | 103 GURL("https://example"), net::DEFAULT_PRIORITY, NULL, |
| 104 TRAFFIC_ANNOTATION_FOR_TESTS); |
103 return request; | 105 return request; |
104 } | 106 } |
OLD | NEW |