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 "build/build_config.h" | 8 #include "build/build_config.h" |
9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
10 #include "chrome/browser/ssl/ssl_client_auth_requestor_mock.h" | 10 #include "chrome/browser/ssl/ssl_client_auth_requestor_mock.h" |
11 #include "chrome/browser/ui/browser.h" | 11 #include "chrome/browser/ui/browser.h" |
12 #include "chrome/browser/ui/browser_window.h" | 12 #include "chrome/browser/ui/browser_window.h" |
13 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 13 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
14 #include "chrome/browser/ui/views/ssl_client_certificate_selector.h" | 14 #include "chrome/browser/ui/views/ssl_client_certificate_selector.h" |
15 #include "chrome/test/base/in_process_browser_test.h" | 15 #include "chrome/test/base/in_process_browser_test.h" |
16 #include "chrome/test/base/interactive_test_utils.h" | 16 #include "chrome/test/base/interactive_test_utils.h" |
17 #include "chrome/test/base/ui_test_utils.h" | 17 #include "chrome/test/base/ui_test_utils.h" |
18 #include "content/public/browser/client_certificate_delegate.h" | 18 #include "content/public/browser/client_certificate_delegate.h" |
19 #include "content/public/browser/web_contents.h" | 19 #include "content/public/browser/web_contents.h" |
20 #include "content/public/test/browser_test_utils.h" | 20 #include "content/public/test/browser_test_utils.h" |
21 #include "net/base/request_priority.h" | 21 #include "net/base/request_priority.h" |
22 #include "net/cert/x509_certificate.h" | 22 #include "net/cert/x509_certificate.h" |
23 #include "net/http/http_transaction_factory.h" | 23 #include "net/http/http_transaction_factory.h" |
24 #include "net/ssl/ssl_cert_request_info.h" | 24 #include "net/ssl/ssl_cert_request_info.h" |
25 #include "net/test/cert_test_util.h" | 25 #include "net/test/cert_test_util.h" |
26 #include "net/test/test_data_directory.h" | 26 #include "net/test/test_data_directory.h" |
| 27 #include "net/traffic_annotation/network_traffic_annotation_test_helper.h" |
27 #include "net/url_request/url_request.h" | 28 #include "net/url_request/url_request.h" |
28 #include "net/url_request/url_request_context.h" | 29 #include "net/url_request/url_request_context.h" |
29 #include "net/url_request/url_request_context_getter.h" | 30 #include "net/url_request/url_request_context_getter.h" |
30 #include "testing/gtest/include/gtest/gtest.h" | 31 #include "testing/gtest/include/gtest/gtest.h" |
31 #include "ui/views/test/widget_test.h" | 32 #include "ui/views/test/widget_test.h" |
32 | 33 |
33 #if defined(USE_NSS_CERTS) | 34 #if defined(USE_NSS_CERTS) |
34 #include "crypto/scoped_test_nss_db.h" | 35 #include "crypto/scoped_test_nss_db.h" |
35 #endif | 36 #endif |
36 | 37 |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
126 virtual void CleanUpOnIOThread() { | 127 virtual void CleanUpOnIOThread() { |
127 delete url_request_; | 128 delete url_request_; |
128 | 129 |
129 io_loop_finished_event_.Signal(); | 130 io_loop_finished_event_.Signal(); |
130 } | 131 } |
131 | 132 |
132 protected: | 133 protected: |
133 std::unique_ptr<net::URLRequest> MakeURLRequest( | 134 std::unique_ptr<net::URLRequest> MakeURLRequest( |
134 net::URLRequestContextGetter* context_getter) { | 135 net::URLRequestContextGetter* context_getter) { |
135 return context_getter->GetURLRequestContext()->CreateRequest( | 136 return context_getter->GetURLRequestContext()->CreateRequest( |
136 GURL("https://example"), net::DEFAULT_PRIORITY, NULL); | 137 GURL("https://example"), net::DEFAULT_PRIORITY, NULL, |
| 138 TRAFFIC_ANNOTATION_FOR_TESTS); |
137 } | 139 } |
138 | 140 |
139 base::WaitableEvent io_loop_finished_event_; | 141 base::WaitableEvent io_loop_finished_event_; |
140 | 142 |
141 scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_; | 143 scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_; |
142 net::URLRequest* url_request_; | 144 net::URLRequest* url_request_; |
143 | 145 |
144 scoped_refptr<net::X509Certificate> client_cert_1_; | 146 scoped_refptr<net::X509Certificate> client_cert_1_; |
145 scoped_refptr<net::X509Certificate> client_cert_2_; | 147 scoped_refptr<net::X509Certificate> client_cert_2_; |
146 net::CertificateList client_certs_; | 148 net::CertificateList client_certs_; |
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
401 EXPECT_TRUE(ui_test_utils::SendKeyPressSync( | 403 EXPECT_TRUE(ui_test_utils::SendKeyPressSync( |
402 browser_1_, ui::VKEY_RETURN, false, false, false, false)); | 404 browser_1_, ui::VKEY_RETURN, false, false, false, false)); |
403 | 405 |
404 Mock::VerifyAndClear(auth_requestor_.get()); | 406 Mock::VerifyAndClear(auth_requestor_.get()); |
405 Mock::VerifyAndClear(auth_requestor_1_.get()); | 407 Mock::VerifyAndClear(auth_requestor_1_.get()); |
406 | 408 |
407 // Now let the default selection for auth_requestor_ mock get checked on | 409 // Now let the default selection for auth_requestor_ mock get checked on |
408 // destruction. | 410 // destruction. |
409 EXPECT_CALL(*auth_requestor_.get(), CancelCertificateSelection()); | 411 EXPECT_CALL(*auth_requestor_.get(), CancelCertificateSelection()); |
410 } | 412 } |
OLD | NEW |