diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 12:59:20 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 12:59:20 +0000 |
| commit | 610ca838d7afb9c551bb186888e2ebf25ca913e7 (patch) | |
| tree | 54368d99af30410f51fa7cdaec4c06bd8389a762 /chrome/renderer/content_settings_observer_browsertest.cc | |
| parent | 6d6fe593efe370ff53dbf9487fe393083162dbc6 (diff) | |
| download | chromium_src-610ca838d7afb9c551bb186888e2ebf25ca913e7.zip chromium_src-610ca838d7afb9c551bb186888e2ebf25ca913e7.tar.gz chromium_src-610ca838d7afb9c551bb186888e2ebf25ca913e7.tar.bz2 | |
Check for default content setting pattern when requiring user authorization for plug-ins.
We now check in the renderer if a plug-in is allowed by default, which is the case if the matching patterns are wildcards.
BUG=100581
TEST=see bug
Review URL: http://codereview.chromium.org/8334020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106270 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 | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/chrome/renderer/content_settings_observer_browsertest.cc b/chrome/renderer/content_settings_observer_browsertest.cc index bc11b17..ceaaee1 100644 --- a/chrome/renderer/content_settings_observer_browsertest.cc +++ b/chrome/renderer/content_settings_observer_browsertest.cc @@ -148,21 +148,17 @@ TEST_F(ChromeRenderViewTest, PluginsTemporarilyAllowed) { ContentSettingsObserver* observer = ContentSettingsObserver::Get(view_); observer->SetContentSettings(settings); ContentSettingsObserver::SetDefaultContentSettings(settings); - EXPECT_EQ(CONTENT_SETTING_BLOCK, - observer->GetContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS)); + EXPECT_FALSE(observer->plugins_temporarily_allowed()); // Temporarily allow plugins. OnMessageReceived(ChromeViewMsg_LoadBlockedPlugins(MSG_ROUTING_NONE)); - EXPECT_EQ(CONTENT_SETTING_ALLOW, - observer->GetContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS)); + EXPECT_TRUE(observer->plugins_temporarily_allowed()); // Simulate a navigation within the page. DidNavigateWithinPage(GetMainFrame(), true); - EXPECT_EQ(CONTENT_SETTING_ALLOW, - observer->GetContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS)); + EXPECT_TRUE(observer->plugins_temporarily_allowed()); // Navigate to a different page. LoadHTML("<html>Bar</html>"); - EXPECT_EQ(CONTENT_SETTING_BLOCK, - observer->GetContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS)); + EXPECT_FALSE(observer->plugins_temporarily_allowed()); } |