diff options
| author | cmp@chromium.org <cmp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-10 01:46:50 +0000 |
|---|---|---|
| committer | cmp@chromium.org <cmp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-10 01:46:50 +0000 |
| commit | bfc2b4cbaa865df05976d73b989d321277b757aa (patch) | |
| tree | a1f39f532ac30a15954cdfc56b5c980b2c268884 /chrome/renderer/content_settings_observer_browsertest.cc | |
| parent | 063b841e1b7462f9af20d8a5e1613c0effe97a72 (diff) | |
| download | chromium_src-bfc2b4cbaa865df05976d73b989d321277b757aa.zip chromium_src-bfc2b4cbaa865df05976d73b989d321277b757aa.tar.gz chromium_src-bfc2b4cbaa865df05976d73b989d321277b757aa.tar.bz2 | |
Revert 109228 - ContentSettingsObserver (+ related classes) cleanup.
<cmp> This CL needs to be reverted before we revert 109213, which we
speculate caused some performance regressions.
Per-page content settings and default content settings are no longer needed,
since the renderer stores the content setting rules for images and scripts.
BUG=102662
TEST=NONE
Review URL: http://codereview.chromium.org/8498007
TBR=marja@chromium.org
Review URL: http://codereview.chromium.org/8497062
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109360 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 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/renderer/content_settings_observer_browsertest.cc b/chrome/renderer/content_settings_observer_browsertest.cc index eb9d337..78c7d21 100644 --- a/chrome/renderer/content_settings_observer_browsertest.cc +++ b/chrome/renderer/content_settings_observer_browsertest.cc @@ -149,7 +149,14 @@ TEST_F(ChromeRenderViewTest, PluginsTemporarilyAllowed) { // Load some HTML. LoadHTML("<html>Foo</html>"); + // Block plugins. + ContentSettings settings; + for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) + settings.settings[i] = CONTENT_SETTING_ALLOW; + settings.settings[CONTENT_SETTINGS_TYPE_PLUGINS] = CONTENT_SETTING_BLOCK; ContentSettingsObserver* observer = ContentSettingsObserver::Get(view_); + observer->SetContentSettings(settings); + observer->SetDefaultContentSettings(&settings); EXPECT_FALSE(observer->plugins_temporarily_allowed()); // Temporarily allow plugins. |