Delegating the "are images allowed" decision to renderer.

chrome/renderer/chrome_content_renderer_client.h

Index: chrome/renderer/chrome_content_renderer_client.h
diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h
index 990fb2046d72e0c28c443033614b552ecb4f8deb..45b0e16e57f877e9c6d7550a8a75bb51fbc78eac 100644
--- a/chrome/renderer/chrome_content_renderer_client.h
+++ b/chrome/renderer/chrome_content_renderer_client.h
@@ -11,6 +11,7 @@
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
+#include "chrome/common/content_settings.h"
 #include "content/public/renderer/content_renderer_client.h"
 
 class ChromeRenderProcessObserver;
@@ -104,6 +105,9 @@ class ChromeContentRendererClient : public content::ContentRendererClient {
   // and start over.
   void OnPurgeMemory();
 
+  void SetImageSettingRules(
+      const ContentSettingsForOneType* image_setting_rules);
+
  private:
   WebKit::WebPlugin* CreatePlugin(
       content::RenderView* render_view,
@@ -145,6 +149,10 @@ class ChromeContentRendererClient : public content::ContentRendererClient {
   SpellCheckProvider* spellcheck_provider_;
   scoped_ptr<VisitedLinkSlave> visited_link_slave_;
   scoped_ptr<safe_browsing::PhishingClassifierFilter> phishing_classifier_;
+  // Owned by |ChromeRenderProcessObserver|. A pointer to the image setting
+  // rules is kept here so that we're able to set it in the tests, without
+  // creating a |ChromeRenderProcessObserver|.

[Bernhard Bauer, 2011/10/18 13:14:31]

So, if there is no ChromeRenderProcessObserver, it's not clear who owns this
pointer :(

Do we actually need a non-empty set of image setting rules in tests? In the unit
test for ContentSettingsObserver it gets its rules separately.

Hm, thinking about it, I'm pretty sure we don't, as the vector in RenderViewTest
is never modified. So, we could make SetImageSettingRules a method on
ContentSettingsObserver, and only call it from ChromeContentRendererClient if
there is a ChromeRenderProcessObserver, and in ContentSettingsObserver just
return the default if it is NULL.

[marja, 2011/10/19 16:56:35]

It was used by ChromeRenderViewTest.Images(Allowed|Blocked)ByDefault. However,
what you said makes sense, so I did that. And the test calls
ContentSettingsObserver::SetImageSettingRules.

+  const ContentSettingsForOneType* image_setting_rules_;
 };
 
 }  // namespace chrome