OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/devtools/devtools_network_transaction.h" | 5 #include "chrome/browser/devtools/devtools_network_transaction.h" |
6 | 6 |
7 #include "chrome/browser/devtools/devtools_network_controller.h" | 7 #include "chrome/browser/devtools/devtools_network_controller.h" |
8 #include "chrome/browser/devtools/devtools_network_interceptor.h" | 8 #include "chrome/browser/devtools/devtools_network_interceptor.h" |
9 #include "net/base/load_timing_info.h" | 9 #include "net/base/load_timing_info.h" |
10 #include "net/base/net_errors.h" | 10 #include "net/base/net_errors.h" |
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
176 int DevToolsNetworkTransaction::RestartIgnoringLastError( | 176 int DevToolsNetworkTransaction::RestartIgnoringLastError( |
177 const net::CompletionCallback& callback) { | 177 const net::CompletionCallback& callback) { |
178 if (failed_) | 178 if (failed_) |
179 return net::ERR_INTERNET_DISCONNECTED; | 179 return net::ERR_INTERNET_DISCONNECTED; |
180 int rv = network_transaction_->RestartIgnoringLastError(proxy_callback_); | 180 int rv = network_transaction_->RestartIgnoringLastError(proxy_callback_); |
181 return SetupCallback(callback, rv, RESTART_IGNORING_LAST_ERROR); | 181 return SetupCallback(callback, rv, RESTART_IGNORING_LAST_ERROR); |
182 } | 182 } |
183 | 183 |
184 int DevToolsNetworkTransaction::RestartWithCertificate( | 184 int DevToolsNetworkTransaction::RestartWithCertificate( |
185 net::X509Certificate* client_cert, | 185 net::X509Certificate* client_cert, |
| 186 net::SSLPrivateKey* client_private_key, |
186 const net::CompletionCallback& callback) { | 187 const net::CompletionCallback& callback) { |
187 if (failed_) | 188 if (failed_) |
188 return net::ERR_INTERNET_DISCONNECTED; | 189 return net::ERR_INTERNET_DISCONNECTED; |
189 int rv = network_transaction_->RestartWithCertificate( | 190 int rv = network_transaction_->RestartWithCertificate( |
190 client_cert, proxy_callback_); | 191 client_cert, client_private_key, proxy_callback_); |
191 return SetupCallback(callback, rv, RESTART_WITH_CERTIFICATE); | 192 return SetupCallback(callback, rv, RESTART_WITH_CERTIFICATE); |
192 } | 193 } |
193 | 194 |
194 int DevToolsNetworkTransaction::RestartWithAuth( | 195 int DevToolsNetworkTransaction::RestartWithAuth( |
195 const net::AuthCredentials& credentials, | 196 const net::AuthCredentials& credentials, |
196 const net::CompletionCallback& callback) { | 197 const net::CompletionCallback& callback) { |
197 if (failed_) | 198 if (failed_) |
198 return net::ERR_INTERNET_DISCONNECTED; | 199 return net::ERR_INTERNET_DISCONNECTED; |
199 int rv = network_transaction_->RestartWithAuth(credentials, proxy_callback_); | 200 int rv = network_transaction_->RestartWithAuth(credentials, proxy_callback_); |
200 return SetupCallback(callback, rv, RESTART_WITH_AUTH); | 201 return SetupCallback(callback, rv, RESTART_WITH_AUTH); |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
295 } | 296 } |
296 | 297 |
297 void DevToolsNetworkTransaction::ThrottleFinished() { | 298 void DevToolsNetworkTransaction::ThrottleFinished() { |
298 DCHECK(!callback_.is_null()); | 299 DCHECK(!callback_.is_null()); |
299 DCHECK(callback_type_ == READ || callback_type_ == START); | 300 DCHECK(callback_type_ == READ || callback_type_ == START); |
300 net::CompletionCallback callback = callback_; | 301 net::CompletionCallback callback = callback_; |
301 callback_.Reset(); | 302 callback_.Reset(); |
302 callback_type_ = NONE; | 303 callback_type_ = NONE; |
303 callback.Run(throttled_result_); | 304 callback.Run(throttled_result_); |
304 } | 305 } |
OLD | NEW |