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 826 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
837 job_->SetAuth(credentials); | 837 job_->SetAuth(credentials); |
838 } | 838 } |
839 | 839 |
840 void URLRequest::CancelAuth() { | 840 void URLRequest::CancelAuth() { |
841 DCHECK(job_.get()); | 841 DCHECK(job_.get()); |
842 DCHECK(job_->NeedsAuth()); | 842 DCHECK(job_->NeedsAuth()); |
843 | 843 |
844 job_->CancelAuth(); | 844 job_->CancelAuth(); |
845 } | 845 } |
846 | 846 |
847 void URLRequest::ContinueWithCertificate(X509Certificate* client_cert) { | 847 void URLRequest::ContinueWithCertificate(X509Certificate* client_cert, |
| 848 SSLPrivateKey* client_private_key) { |
848 DCHECK(job_.get()); | 849 DCHECK(job_.get()); |
849 | 850 |
850 job_->ContinueWithCertificate(client_cert); | 851 job_->ContinueWithCertificate(client_cert, client_private_key); |
851 } | 852 } |
852 | 853 |
853 void URLRequest::ContinueDespiteLastError() { | 854 void URLRequest::ContinueDespiteLastError() { |
854 DCHECK(job_.get()); | 855 DCHECK(job_.get()); |
855 | 856 |
856 job_->ContinueDespiteLastError(); | 857 job_->ContinueDespiteLastError(); |
857 } | 858 } |
858 | 859 |
859 void URLRequest::PrepareToRestart() { | 860 void URLRequest::PrepareToRestart() { |
860 DCHECK(job_.get()); | 861 DCHECK(job_.get()); |
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1197 } | 1198 } |
1198 | 1199 |
1199 void URLRequest::GetConnectionAttempts(ConnectionAttempts* out) const { | 1200 void URLRequest::GetConnectionAttempts(ConnectionAttempts* out) const { |
1200 if (job_) | 1201 if (job_) |
1201 job_->GetConnectionAttempts(out); | 1202 job_->GetConnectionAttempts(out); |
1202 else | 1203 else |
1203 out->clear(); | 1204 out->clear(); |
1204 } | 1205 } |
1205 | 1206 |
1206 } // namespace net | 1207 } // namespace net |
OLD | NEW |