diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-18 17:00:15 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-18 17:00:15 +0000 |
| commit | 5e56df8fb10f7aca72c51184ea66e4d5462d31e3 (patch) | |
| tree | d49606d0e1af4ec568dfa8f03c778c7ae0780d06 /content/renderer/render_view_browsertest.cc | |
| parent | f3f4d7fc63d2e686208de341e01c559a2f0a4487 (diff) | |
| download | chromium_src-5e56df8fb10f7aca72c51184ea66e4d5462d31e3.zip chromium_src-5e56df8fb10f7aca72c51184ea66e4d5462d31e3.tar.gz chromium_src-5e56df8fb10f7aca72c51184ea66e4d5462d31e3.tar.bz2 | |
Move the content settings code out of RenderView, since it belongs in the Chrome layer.
BUG=76793
Review URL: http://codereview.chromium.org/6873040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81955 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/render_view_browsertest.cc')
| -rw-r--r-- | content/renderer/render_view_browsertest.cc | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc index afce5c3..3f8eb92 100644 --- a/content/renderer/render_view_browsertest.cc +++ b/content/renderer/render_view_browsertest.cc @@ -771,56 +771,6 @@ TEST_F(RenderViewTest, DidFailProvisionalLoadWithErrorForCancellation) { EXPECT_TRUE(web_frame->isViewSourceModeEnabled()); } -// Regression test for http://crbug.com/35011 -TEST_F(RenderViewTest, JSBlockSentAfterPageLoad) { - // 1. Load page with JS. - std::string html = "<html>" - "<head>" - "<script>document.createElement('div');</script>" - "</head>" - "<body>" - "</body>" - "</html>"; - render_thread_.sink().ClearMessages(); - LoadHTML(html.c_str()); - - // 2. Block JavaScript. - ContentSettings settings; - for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) - settings.settings[i] = CONTENT_SETTING_ALLOW; - settings.settings[CONTENT_SETTINGS_TYPE_JAVASCRIPT] = CONTENT_SETTING_BLOCK; - view_->SetContentSettings(settings); - - // Make sure no pending messages are in the queue. - ProcessPendingMessages(); - render_thread_.sink().ClearMessages(); - - // 3. Reload page. - ViewMsg_Navigate_Params params; - std::string url_str = "data:text/html;charset=utf-8,"; - url_str.append(html); - GURL url(url_str); - params.url = url; - params.navigation_type = ViewMsg_Navigate_Type::RELOAD; - view_->OnNavigate(params); - ProcessPendingMessages(); - - // 4. Verify that the notification that javascript was blocked is sent after - // the navigation notifiction is sent. - int navigation_index = -1; - int block_index = -1; - for (size_t i = 0; i < render_thread_.sink().message_count(); ++i) { - const IPC::Message* msg = render_thread_.sink().GetMessageAt(i); - if (msg->type() == ViewHostMsg_FrameNavigate::ID) - navigation_index = i; - if (msg->type() == ViewHostMsg_ContentBlocked::ID) - block_index = i; - } - EXPECT_NE(-1, navigation_index); - EXPECT_NE(-1, block_index); - EXPECT_LT(navigation_index, block_index); -} - // Regression test for http://crbug.com/41562 TEST_F(RenderViewTest, UpdateTargetURLWithInvalidURL) { const GURL invalid_gurl("http://"); |