diff options
| author | dgozman@chromium.org <dgozman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-08 10:45:30 +0000 |
|---|---|---|
| committer | dgozman@chromium.org <dgozman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-08 10:45:30 +0000 |
| commit | 17d98882cb289c998854d0bea0f87509e8fea858 (patch) | |
| tree | 8fa11a1b29d261af53e5f0eebb4f8e8ef0147274 /chrome/renderer/content_settings_observer_browsertest.cc | |
| parent | e9005779e42a908cb54400018b94a2f158116321 (diff) | |
| download | chromium_src-17d98882cb289c998854d0bea0f87509e8fea858.zip chromium_src-17d98882cb289c998854d0bea0f87509e8fea858.tar.gz chromium_src-17d98882cb289c998854d0bea0f87509e8fea858.tar.bz2 | |
Revert 113579 - Content settings: allow scripts on interstitial pages even if JavaScript is blocked.
BUG=104700
TEST=ChromeRenderViewTest.ContentSettingsInterstitialPages
Review URL: http://codereview.chromium.org/8773035
TBR=marja@chromium.org
Review URL: http://codereview.chromium.org/8889008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113591 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/content_settings_observer_browsertest.cc')
| -rw-r--r-- | chrome/renderer/content_settings_observer_browsertest.cc | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/chrome/renderer/content_settings_observer_browsertest.cc b/chrome/renderer/content_settings_observer_browsertest.cc index db720f5..d05df62 100644 --- a/chrome/renderer/content_settings_observer_browsertest.cc +++ b/chrome/renderer/content_settings_observer_browsertest.cc @@ -322,55 +322,3 @@ TEST_F(ChromeRenderViewTest, ContentSettingsAllowScripts) { } EXPECT_FALSE(was_blocked); } - -TEST_F(ChromeRenderViewTest, ContentSettingsInterstitialPages) { - MockContentSettingsObserver mock_observer(view_); - // Block scripts. - RendererContentSettingRules content_setting_rules; - ContentSettingsForOneType& script_setting_rules = - content_setting_rules.script_rules; - script_setting_rules.push_back( - ContentSettingPatternSource( - ContentSettingsPattern::Wildcard(), - ContentSettingsPattern::Wildcard(), - CONTENT_SETTING_BLOCK, "", false)); - // Block images. - ContentSettingsForOneType& image_setting_rules = - content_setting_rules.image_rules; - image_setting_rules.push_back( - ContentSettingPatternSource( - ContentSettingsPattern::Wildcard(), - ContentSettingsPattern::Wildcard(), - CONTENT_SETTING_BLOCK, "", false)); - - ContentSettingsObserver* observer = ContentSettingsObserver::Get(view_); - observer->SetContentSettingRules(&content_setting_rules); - observer->SetAsInterstitial(); - - // Load a page which contains a script. - std::string html = "<html>" - "<head>" - "<script src='data:foo'></script>" - "</head>" - "<body>" - "</body>" - "</html>"; - LoadHTML(html.c_str()); - - // Verify that the script was allowed. - bool was_blocked = false; - for (size_t i = 0; i < render_thread_->sink().message_count(); ++i) { - const IPC::Message* msg = render_thread_->sink().GetMessageAt(i); - if (msg->type() == ChromeViewHostMsg_ContentBlocked::ID) - was_blocked = true; - } - EXPECT_FALSE(was_blocked); - - // Verify that images are allowed. - EXPECT_CALL( - mock_observer, - OnContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES, std::string())).Times(0); - EXPECT_TRUE(observer->AllowImage(GetMainFrame(), true, - mock_observer.image_url_)); - ::testing::Mock::VerifyAndClearExpectations(&observer); -} |