Merge 106270 - Check for default content settings when requiring user authorization for plug-ins.

chrome/renderer/content_settings_observer.h

Index: chrome/renderer/content_settings_observer.h
diff --git a/chrome/renderer/content_settings_observer.h b/chrome/renderer/content_settings_observer.h
index afe0bb9e54909e461e32e11fcb11709cd625fbe6..45f2125a1b9e88a800a36e89ed1fbe7a0a77348d 100644
--- a/chrome/renderer/content_settings_observer.h
+++ b/chrome/renderer/content_settings_observer.h
@@ -38,6 +38,10 @@ class ContentSettingsObserver
   // Returns the setting for the given type.
   ContentSetting GetContentSetting(ContentSettingsType type);
 
+  bool plugins_temporarily_allowed() {
+    return plugins_temporarily_allowed_;
+  }
+
   // Sends an IPC notification that the specified content type was blocked.
   // If the content type requires it, |resource_identifier| names the specific
   // resource that was blocked (the plugin path in the case of plugins),