summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test/net
diff options
context:
space:
mode:
authorvabr@chromium.org <vabr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-26 02:49:30 +0000
committervabr@chromium.org <vabr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-26 02:49:30 +0000
commitdc5a5cfc52bd701e7ae8ffc61d7b5b1daa3c747e (patch)
treeb9ae2c94db03cd9b7034f1ed7a44f97358e90805 /chrome_frame/test/net
parentd0c9fef9a86aae0437f2ef85c5c1f224ef8da9f2 (diff)
downloadchromium_src-dc5a5cfc52bd701e7ae8ffc61d7b5b1daa3c747e.zip
chromium_src-dc5a5cfc52bd701e7ae8ffc61d7b5b1daa3c747e.tar.gz
chromium_src-dc5a5cfc52bd701e7ae8ffc61d7b5b1daa3c747e.tar.bz2
There are two blocking network delegates in url_request_unittest:
BlockingNetworkDelegate and BlockingNetworkDelegateWithManualCallback They provide various functions: * blocking in various stages of the request * three ways of responding in blocked stages: synchronous, automatic callback, and user-triggered callback * redirection But not all combinations are available (e.g. synchronous blocking after headers are sent), because the user has to chose only one of the delegates. This CL aims at allowing to combine those functions without code duplication, by joining the two classes into one. BUG=146816 TEST=N/A (this is only in unittests, also no change in behaviour of any unit-test, and no new added) Historical description for this issue, remove once the current plan stabilises: ------------------------------------------------------ Adding a base class for the blocking network delegates There are two blocking network delegates in url_request_unittest: BlockingNetworkDelegate and BlockingNetworkDelegateWithManualCallback They were independent until now, but for http://codereview.chromium.org/10911151/ BlockingNetworkDelegate needs to be able to block in various stages of the request, such as BlockingNetworkDelegateWithManualCallback does. To avoid code duplication, the common functionality is here moved to a common base class BlockingNetworkDelegateBase from which the original two inherit. This adds no new functions, nor changes it the behaviour of the current tests. ------------------------------------------------------ Review URL: https://chromiumcodereview.appspot.com/10905259 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158724 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/net')
-rw-r--r--chrome_frame/test/net/fake_external_tab.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc
index 74dd42a..8608696 100644
--- a/chrome_frame/test/net/fake_external_tab.cc
+++ b/chrome_frame/test/net/fake_external_tab.cc
@@ -203,6 +203,11 @@ void FilterDisabledTests() {
"URLRequestTestHTTP.VaryHeader",
"URLRequestTestHTTP.GetZippedTest",
+ // Tests that requests can be blocked asynchronously in states
+ // OnBeforeURLRequest, OnBeforeSendHeaders and OnHeadersReceived. At least
+ // the second state is not supported by CF.
+ "URLRequestTestHTTP.NetworkDelegateBlockAsynchronously",
+
// Tests that requests can be cancelled while blocking in
// OnBeforeSendHeaders state. But this state is not supported by CF.
"URLRequestTestHTTP.NetworkDelegateCancelWhileWaiting2",