Commit 881ef3f3 authored by dgozman's avatar dgozman Committed by Commit bot

[DevTools] Call directly into underlying http transaction when throttling is disabled.

This guarantees that any throttling-specific errors do no affect no-throttling scenario.

BUG=none

Review URL: https://codereview.chromium.org/1461403003

Cr-Commit-Position: refs/heads/master@{#361193}
parent b425288a
...@@ -150,8 +150,10 @@ int DevToolsNetworkTransaction::Start( ...@@ -150,8 +150,10 @@ int DevToolsNetworkTransaction::Start(
return net::ERR_INTERNET_DISCONNECTED; return net::ERR_INTERNET_DISCONNECTED;
} }
if (interceptor_) if (!interceptor_)
interceptor_->AddThrottable(this); return network_transaction_->Start(request_, callback, net_log);
interceptor_->AddThrottable(this);
int rv = network_transaction_->Start(request_, proxy_callback_, net_log); int rv = network_transaction_->Start(request_, proxy_callback_, net_log);
return SetupCallback(callback, rv, START); return SetupCallback(callback, rv, START);
} }
...@@ -175,6 +177,8 @@ int DevToolsNetworkTransaction::RestartIgnoringLastError( ...@@ -175,6 +177,8 @@ int DevToolsNetworkTransaction::RestartIgnoringLastError(
const net::CompletionCallback& callback) { const net::CompletionCallback& callback) {
if (failed_) if (failed_)
return net::ERR_INTERNET_DISCONNECTED; return net::ERR_INTERNET_DISCONNECTED;
if (!interceptor_)
return network_transaction_->RestartIgnoringLastError(callback);
int rv = network_transaction_->RestartIgnoringLastError(proxy_callback_); int rv = network_transaction_->RestartIgnoringLastError(proxy_callback_);
return SetupCallback(callback, rv, RESTART_IGNORING_LAST_ERROR); return SetupCallback(callback, rv, RESTART_IGNORING_LAST_ERROR);
} }
...@@ -185,6 +189,10 @@ int DevToolsNetworkTransaction::RestartWithCertificate( ...@@ -185,6 +189,10 @@ int DevToolsNetworkTransaction::RestartWithCertificate(
const net::CompletionCallback& callback) { const net::CompletionCallback& callback) {
if (failed_) if (failed_)
return net::ERR_INTERNET_DISCONNECTED; return net::ERR_INTERNET_DISCONNECTED;
if (!interceptor_) {
return network_transaction_->RestartWithCertificate(
client_cert, client_private_key, callback);
}
int rv = network_transaction_->RestartWithCertificate( int rv = network_transaction_->RestartWithCertificate(
client_cert, client_private_key, proxy_callback_); client_cert, client_private_key, proxy_callback_);
return SetupCallback(callback, rv, RESTART_WITH_CERTIFICATE); return SetupCallback(callback, rv, RESTART_WITH_CERTIFICATE);
...@@ -195,6 +203,8 @@ int DevToolsNetworkTransaction::RestartWithAuth( ...@@ -195,6 +203,8 @@ int DevToolsNetworkTransaction::RestartWithAuth(
const net::CompletionCallback& callback) { const net::CompletionCallback& callback) {
if (failed_) if (failed_)
return net::ERR_INTERNET_DISCONNECTED; return net::ERR_INTERNET_DISCONNECTED;
if (!interceptor_)
return network_transaction_->RestartWithAuth(credentials, callback);
int rv = network_transaction_->RestartWithAuth(credentials, proxy_callback_); int rv = network_transaction_->RestartWithAuth(credentials, proxy_callback_);
return SetupCallback(callback, rv, RESTART_WITH_AUTH); return SetupCallback(callback, rv, RESTART_WITH_AUTH);
} }
...@@ -209,6 +219,8 @@ int DevToolsNetworkTransaction::Read( ...@@ -209,6 +219,8 @@ int DevToolsNetworkTransaction::Read(
const net::CompletionCallback& callback) { const net::CompletionCallback& callback) {
if (failed_) if (failed_)
return net::ERR_INTERNET_DISCONNECTED; return net::ERR_INTERNET_DISCONNECTED;
if (!interceptor_)
return network_transaction_->Read(buf, buf_len, callback);
int rv = network_transaction_->Read(buf, buf_len, proxy_callback_); int rv = network_transaction_->Read(buf, buf_len, proxy_callback_);
return SetupCallback(callback, rv, READ); return SetupCallback(callback, rv, READ);
} }
...@@ -284,6 +296,8 @@ void DevToolsNetworkTransaction::SetBeforeProxyHeadersSentCallback( ...@@ -284,6 +296,8 @@ void DevToolsNetworkTransaction::SetBeforeProxyHeadersSentCallback(
int DevToolsNetworkTransaction::ResumeNetworkStart() { int DevToolsNetworkTransaction::ResumeNetworkStart() {
if (failed_) if (failed_)
return net::ERR_INTERNET_DISCONNECTED; return net::ERR_INTERNET_DISCONNECTED;
if (!interceptor_)
return network_transaction_->ResumeNetworkStart();
return network_transaction_->ResumeNetworkStart(); return network_transaction_->ResumeNetworkStart();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment