Check for default content setting pattern when requiring user authorization for plug-ins.

chrome/renderer/content_settings_observer.cc

Index: chrome/renderer/content_settings_observer.cc
diff --git a/chrome/renderer/content_settings_observer.cc b/chrome/renderer/content_settings_observer.cc
index a8d0e241d07c7fc8f64fbf02456103f877951732..94150e65b4ff6968ee426bb3a351b9eb13b55024 100644
--- a/chrome/renderer/content_settings_observer.cc
+++ b/chrome/renderer/content_settings_observer.cc
@@ -77,10 +77,8 @@ void ContentSettingsObserver::SetDefaultContentSettings(
 
 ContentSetting ContentSettingsObserver::GetContentSetting(
     ContentSettingsType type) {
-  if (type == CONTENT_SETTINGS_TYPE_PLUGINS &&
-      plugins_temporarily_allowed_) {
-    return CONTENT_SETTING_ALLOW;
-  }
+  // Don't call this for plug-ins.
+  DCHECK_NE(CONTENT_SETTINGS_TYPE_PLUGINS, type);

[marja, 2011/10/19 07:44:31]

The tests still seem to call this for plug-ins.

[Bernhard Bauer, 2011/10/19 09:53:50]

Fixed.

   return current_content_settings_.settings[type];
 }