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 "net/url_request/url_request.h" | 5 #include "net/url_request/url_request.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/callback.h" | 9 #include "base/callback.h" |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
(...skipping 12 matching lines...) Expand all Loading... | |
23 #include "net/base/load_flags.h" | 23 #include "net/base/load_flags.h" |
24 #include "net/base/load_timing_info.h" | 24 #include "net/base/load_timing_info.h" |
25 #include "net/base/net_errors.h" | 25 #include "net/base/net_errors.h" |
26 #include "net/base/network_change_notifier.h" | 26 #include "net/base/network_change_notifier.h" |
27 #include "net/base/network_delegate.h" | 27 #include "net/base/network_delegate.h" |
28 #include "net/base/upload_data_stream.h" | 28 #include "net/base/upload_data_stream.h" |
29 #include "net/http/http_response_headers.h" | 29 #include "net/http/http_response_headers.h" |
30 #include "net/http/http_util.h" | 30 #include "net/http/http_util.h" |
31 #include "net/log/net_log.h" | 31 #include "net/log/net_log.h" |
32 #include "net/ssl/ssl_cert_request_info.h" | 32 #include "net/ssl/ssl_cert_request_info.h" |
33 #include "net/ssl/ssl_private_key.h" | |
davidben
2015/09/25 20:10:12
I don't think you need this include when using raw
svaldez
2015/09/28 16:54:53
Done.
| |
33 #include "net/url_request/redirect_info.h" | 34 #include "net/url_request/redirect_info.h" |
34 #include "net/url_request/url_request_context.h" | 35 #include "net/url_request/url_request_context.h" |
35 #include "net/url_request/url_request_error_job.h" | 36 #include "net/url_request/url_request_error_job.h" |
36 #include "net/url_request/url_request_job.h" | 37 #include "net/url_request/url_request_job.h" |
37 #include "net/url_request/url_request_job_manager.h" | 38 #include "net/url_request/url_request_job_manager.h" |
38 #include "net/url_request/url_request_netlog_params.h" | 39 #include "net/url_request/url_request_netlog_params.h" |
39 #include "net/url_request/url_request_redirect_job.h" | 40 #include "net/url_request/url_request_redirect_job.h" |
40 #include "url/gurl.h" | 41 #include "url/gurl.h" |
41 #include "url/origin.h" | 42 #include "url/origin.h" |
42 | 43 |
(...skipping 798 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
841 job_->SetAuth(credentials); | 842 job_->SetAuth(credentials); |
842 } | 843 } |
843 | 844 |
844 void URLRequest::CancelAuth() { | 845 void URLRequest::CancelAuth() { |
845 DCHECK(job_.get()); | 846 DCHECK(job_.get()); |
846 DCHECK(job_->NeedsAuth()); | 847 DCHECK(job_->NeedsAuth()); |
847 | 848 |
848 job_->CancelAuth(); | 849 job_->CancelAuth(); |
849 } | 850 } |
850 | 851 |
851 void URLRequest::ContinueWithCertificate(X509Certificate* client_cert) { | 852 void URLRequest::ContinueWithCertificate(X509Certificate* client_cert, |
853 SSLPrivateKey* client_pkey) { | |
852 DCHECK(job_.get()); | 854 DCHECK(job_.get()); |
853 | 855 |
854 job_->ContinueWithCertificate(client_cert); | 856 job_->ContinueWithCertificate(client_cert, client_pkey); |
855 } | 857 } |
856 | 858 |
857 void URLRequest::ContinueDespiteLastError() { | 859 void URLRequest::ContinueDespiteLastError() { |
858 DCHECK(job_.get()); | 860 DCHECK(job_.get()); |
859 | 861 |
860 job_->ContinueDespiteLastError(); | 862 job_->ContinueDespiteLastError(); |
861 } | 863 } |
862 | 864 |
863 void URLRequest::PrepareToRestart() { | 865 void URLRequest::PrepareToRestart() { |
864 DCHECK(job_.get()); | 866 DCHECK(job_.get()); |
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1196 } | 1198 } |
1197 | 1199 |
1198 void URLRequest::GetConnectionAttempts(ConnectionAttempts* out) const { | 1200 void URLRequest::GetConnectionAttempts(ConnectionAttempts* out) const { |
1199 if (job_) | 1201 if (job_) |
1200 job_->GetConnectionAttempts(out); | 1202 job_->GetConnectionAttempts(out); |
1201 else | 1203 else |
1202 out->clear(); | 1204 out->clear(); |
1203 } | 1205 } |
1204 | 1206 |
1205 } // namespace net | 1207 } // namespace net |
OLD | NEW |