summaryrefslogtreecommitdiffstats
path: root/net/http
diff options
context:
space:
mode:
authormpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-13 23:16:41 +0000
committermpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-13 23:16:41 +0000
commita785dab62712680006d9152b584a280ef0b97fcd (patch)
treeefd5d85ade098e06081cd7b2851ccd8cb414ac69 /net/http
parentf6fd8fad1d94293c156b144edd6c5e13bd200b3c (diff)
downloadchromium_src-a785dab62712680006d9152b584a280ef0b97fcd.zip
chromium_src-a785dab62712680006d9152b584a280ef0b97fcd.tar.gz
chromium_src-a785dab62712680006d9152b584a280ef0b97fcd.tar.bz2
Revert "Allow extensions to redirect requests in onBeforeRequest."
The change introduced a regression in the WebRequestEvents api test. TBR=mpcomplete git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81503 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http')
-rw-r--r--net/http/http_cache_transaction.cc2
-rw-r--r--net/http/http_network_transaction.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/http/http_cache_transaction.cc b/net/http/http_cache_transaction.cc
index a12a64f..c4293d9 100644
--- a/net/http/http_cache_transaction.cc
+++ b/net/http/http_cache_transaction.cc
@@ -908,7 +908,7 @@ int HttpCache::Transaction::DoNotifyBeforeSendHeaders() {
// TODO(mpcomplete): need to be able to modify these headers.
HttpRequestHeaders headers = request_->extra_headers;
return cache_->GetSession()->network_delegate()->NotifyBeforeSendHeaders(
- request_->request_id, cache_callback_, &headers);
+ request_->request_id, &headers, cache_callback_);
}
return OK;
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index 5651a41..f7d3acc 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -771,7 +771,7 @@ int HttpNetworkTransaction::DoBuildRequest() {
if (session_->network_delegate()) {
return session_->network_delegate()->NotifyBeforeSendHeaders(
- request_->request_id, delegate_callback_, &request_headers_);
+ request_->request_id, &request_headers_, delegate_callback_);
}
return OK;