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 "chrome/test/base/ui_test_utils.h" | 12 #include "chrome/test/base/ui_test_utils.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/test_data_directory.h" | 16 #include "net/base/test_data_directory.h" |
16 #include "net/cert/x509_certificate.h" | 17 #include "net/cert/x509_certificate.h" |
17 #include "net/http/http_transaction_factory.h" | 18 #include "net/http/http_transaction_factory.h" |
18 #include "net/ssl/ssl_cert_request_info.h" | 19 #include "net/ssl/ssl_cert_request_info.h" |
19 #include "net/test/cert_test_util.h" | 20 #include "net/test/cert_test_util.h" |
20 #include "net/url_request/url_request.h" | 21 #include "net/url_request/url_request.h" |
21 #include "net/url_request/url_request_context.h" | 22 #include "net/url_request/url_request_context.h" |
22 #include "net/url_request/url_request_context_getter.h" | 23 #include "net/url_request/url_request_context_getter.h" |
23 | 24 |
24 using ::testing::Mock; | 25 using ::testing::Mock; |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
71 FROM_HERE, | 72 FROM_HERE, |
72 base::Bind(&SSLClientCertificateSelectorTestBase::CleanUpOnIOThread, | 73 base::Bind(&SSLClientCertificateSelectorTestBase::CleanUpOnIOThread, |
73 this)); | 74 this)); |
74 | 75 |
75 io_loop_finished_event_.Wait(); | 76 io_loop_finished_event_.Wait(); |
76 | 77 |
77 auth_requestor_ = NULL; | 78 auth_requestor_ = NULL; |
78 } | 79 } |
79 | 80 |
80 void SSLClientCertificateSelectorTestBase::SetUpOnIOThread() { | 81 void SSLClientCertificateSelectorTestBase::SetUpOnIOThread() { |
81 url_request_ = MakeURLRequest(url_request_context_getter_.get()); | 82 url_request_ = MakeURLRequest(url_request_context_getter_.get()).release(); |
82 | 83 |
83 auth_requestor_ = new StrictMock<SSLClientAuthRequestorMock>( | 84 auth_requestor_ = new StrictMock<SSLClientAuthRequestorMock>( |
84 url_request_, cert_request_info_.get()); | 85 url_request_, cert_request_info_.get()); |
85 | 86 |
86 io_loop_finished_event_.Signal(); | 87 io_loop_finished_event_.Signal(); |
87 } | 88 } |
88 | 89 |
89 void SSLClientCertificateSelectorTestBase::CleanUpOnIOThread() { | 90 void SSLClientCertificateSelectorTestBase::CleanUpOnIOThread() { |
90 delete url_request_; | 91 delete url_request_; |
91 | 92 |
92 io_loop_finished_event_.Signal(); | 93 io_loop_finished_event_.Signal(); |
93 } | 94 } |
94 | 95 |
95 net::URLRequest* SSLClientCertificateSelectorTestBase::MakeURLRequest( | 96 scoped_ptr<net::URLRequest> |
| 97 SSLClientCertificateSelectorTestBase::MakeURLRequest( |
96 net::URLRequestContextGetter* context_getter) { | 98 net::URLRequestContextGetter* context_getter) { |
97 net::URLRequest* request = | 99 scoped_ptr<net::URLRequest> request = |
98 context_getter->GetURLRequestContext()->CreateRequest( | 100 context_getter->GetURLRequestContext()->CreateRequest( |
99 GURL("https://example"), NULL); | 101 GURL("https://example"), net::DEFAULT_PRIORITY, NULL); |
100 return request; | 102 return request.Pass(); |
101 } | 103 } |
OLD | NEW |