summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-04 20:51:21 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-04 20:51:21 +0000
commita775aa514c2022e5a42b3e3a0e306054efc3f7f7 (patch)
treef5f392605183f29532e9b393b57d6e37c6a872ed
parent0af60fc0e16654b8b8387f737eac30cf5426445a (diff)
downloadchromium_src-a775aa514c2022e5a42b3e3a0e306054efc3f7f7.zip
chromium_src-a775aa514c2022e5a42b3e3a0e306054efc3f7f7.tar.gz
chromium_src-a775aa514c2022e5a42b3e3a0e306054efc3f7f7.tar.bz2
Revert unintended changes.
These mistakenly slipped in with r22389. R=dglazkov BUG=none TEST=none Review URL: http://codereview.chromium.org/160599 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22402 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/tools/test_shell/test_webview_delegate.cc8
-rw-r--r--webkit/tools/test_shell/test_webview_delegate.h11
2 files changed, 0 insertions, 19 deletions
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index 003a8396..ebd25db 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -242,14 +242,6 @@ void TestWebViewDelegate::WillSendRequest(WebFrame* webframe,
request_url.c_str());
}
- if (block_redirects_) {
- printf("Returning null for this redirect\n");
-
- // To block the request, we set its URL to an empty one.
- request->setURL(WebURL());
- return;
- }
-
if (TestShell::layout_test_mode() && !host.empty() &&
(url.SchemeIs("http") || url.SchemeIs("https")) &&
host != "127.0.0.1" &&
diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h
index d9fff48..dfaac4e 100644
--- a/webkit/tools/test_shell/test_webview_delegate.h
+++ b/webkit/tools/test_shell/test_webview_delegate.h
@@ -74,7 +74,6 @@ class TestWebViewDelegate : public base::RefCounted<TestWebViewDelegate>,
#else
, select_trailing_whitespace_enabled_(false)
#endif
- , block_redirects_(false)
#if defined(OS_LINUX)
, cursor_type_(GDK_X_CURSOR)
#endif
@@ -281,13 +280,6 @@ class TestWebViewDelegate : public base::RefCounted<TestWebViewDelegate>,
void SetCustomPolicyDelegate(bool is_custom, bool is_permissive);
void WaitForPolicyDelegate();
- void set_block_redirects(bool block_redirects) {
- block_redirects_ = block_redirects;
- }
- bool block_redirects() const {
- return block_redirects_;
- }
-
protected:
// Called the title of the page changes.
// Can be used to update the title of the window.
@@ -357,9 +349,6 @@ class TestWebViewDelegate : public base::RefCounted<TestWebViewDelegate>,
// true if we want to enable selection of trailing whitespaces
bool select_trailing_whitespace_enabled_;
- // true if we should block any redirects
- bool block_redirects_;
-
CapturedContextMenuEvents captured_context_menu_events_;
WebCursor current_cursor_;