diff options
author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-06 05:34:22 +0000 |
---|---|---|
committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-06 05:34:22 +0000 |
commit | a1353855e56d0154af127b9cb6df95287a4d5be5 (patch) | |
tree | 47cef5603a8aef575b50a141a2ae1761ec73dcfc /webkit/tools/test_shell/layout_test_controller.cc | |
parent | 1ae2665cfca4f42e4e2b364d39739c04e77d0499 (diff) | |
download | chromium_src-a1353855e56d0154af127b9cb6df95287a4d5be5.zip chromium_src-a1353855e56d0154af127b9cb6df95287a4d5be5.tar.gz chromium_src-a1353855e56d0154af127b9cb6df95287a4d5be5.tar.bz2 |
Fix a bunch of layout tests related to dumpResourceLoadCallbacks.
There are several changes included:
1- Fixed up some of the signatures of virtual methods on TestWebViewDelegate so that they actually get called.
2- Fudged the output of some of the events so that they match the WebKit Mac results. This means outputing NSError instead of WebError, etc.
3- Modified WebURLLoaderImpl to send a more meaningful redirect request. This allows some tests to observe that we are for example going to be issuing a POST request in response to a 307 redirect of a POST request.
4- Modified WebViewDelegate::WillSendRequest to take a redirect_response parameter so that the TestWebViewDelegate can log information about that.
5- Deleted a number of custom baselines that are now unnecessary! :-)
6- Removed some code from WebFrameLoaderClientImpl::dispatchWillSendRequest that was causing our setting for firstPartyForCookies to differ from Safari.
This CL depends on WebKit r46820.
R=dglazkov,abarth
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/164033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22590 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/layout_test_controller.cc')
-rw-r--r-- | webkit/tools/test_shell/layout_test_controller.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/webkit/tools/test_shell/layout_test_controller.cc b/webkit/tools/test_shell/layout_test_controller.cc index ba0382e..f3754ce 100644 --- a/webkit/tools/test_shell/layout_test_controller.cc +++ b/webkit/tools/test_shell/layout_test_controller.cc @@ -117,6 +117,7 @@ LayoutTestController::LayoutTestController(TestShell* shell) { BindMethod("setIconDatabaseEnabled", &LayoutTestController::setIconDatabaseEnabled); BindMethod("setCustomPolicyDelegate", &LayoutTestController::setCustomPolicyDelegate); BindMethod("waitForPolicyDelegate", &LayoutTestController::waitForPolicyDelegate); + BindMethod("setWillSendRequestReturnsNullOnRedirect", &LayoutTestController::setWillSendRequestReturnsNullOnRedirect); // The following are stubs. BindMethod("dumpAsWebArchive", &LayoutTestController::dumpAsWebArchive); @@ -587,6 +588,14 @@ void LayoutTestController::waitForPolicyDelegate( result->SetNull(); } +void LayoutTestController::setWillSendRequestReturnsNullOnRedirect( + const CppArgumentList& args, CppVariant* result) { + if (args.size() > 0 && args[0].isBool()) + shell_->delegate()->set_block_redirects(args[0].value.boolValue); + + result->SetNull(); +} + void LayoutTestController::pathToLocalResource( const CppArgumentList& args, CppVariant* result) { result->SetNull(); |