summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorvabr@chromium.org <vabr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-27 06:15:30 +0000
committervabr@chromium.org <vabr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-27 06:15:30 +0000
commitb4438d34836a988317a187f893399dc5e64050c3 (patch)
tree58bfb122c94863caddf85fa307b816c370af2fe1 /chrome_frame
parent35e55c701b89e06d1ad75ecbe7420961e2f43670 (diff)
downloadchromium_src-b4438d34836a988317a187f893399dc5e64050c3.zip
chromium_src-b4438d34836a988317a187f893399dc5e64050c3.tar.gz
chromium_src-b4438d34836a988317a187f893399dc5e64050c3.tar.bz2
URLRequestHttpJob::StartTransaction should honour network delegate.
If a network delegate returns net::ERR_BLOCKED_BY_CLIENT inside URLRequestHttpJob::StartTransaction() the job is not cancelled. This does not happen, e.g., when ERR_BLOCKED_BY_CLIENT is returned within URLRequestHttpJob::OnStartCompleted(). This CL attempts to change the behaviour of StartTransaction() to cancel the job on the error signal from the delegate. BUG=146816 TEST=This is not testable in the browser without custom code changes yet. Review URL: https://chromiumcodereview.appspot.com/10911151 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158984 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/test/net/fake_external_tab.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc
index 8608696..943bdcde 100644
--- a/chrome_frame/test/net/fake_external_tab.cc
+++ b/chrome_frame/test/net/fake_external_tab.cc
@@ -208,6 +208,13 @@ void FilterDisabledTests() {
// the second state is not supported by CF.
"URLRequestTestHTTP.NetworkDelegateBlockAsynchronously",
+ // Tests for cancelling requests in states OnBeforeSendHeaders and
+ // OnHeadersReceived, which do not seem supported by CF.
+ "URLRequestTestHTTP.NetworkDelegateCancelRequestSynchronously2",
+ "URLRequestTestHTTP.NetworkDelegateCancelRequestSynchronously3",
+ "URLRequestTestHTTP.NetworkDelegateCancelRequestAsynchronously2",
+ "URLRequestTestHTTP.NetworkDelegateCancelRequestAsynchronously3",
+
// Tests that requests can be cancelled while blocking in
// OnBeforeSendHeaders state. But this state is not supported by CF.
"URLRequestTestHTTP.NetworkDelegateCancelWhileWaiting2",