Delegating the "are images allowed" decision to renderer.

chrome/renderer/chrome_content_renderer_client.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_
 #define CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_
 #pragma once
 
 #include <string>
 
 #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;
 class ExtensionDispatcher;
 class RendererHistogramSnapshots;
 class RendererNetPredictor;
 class SpellCheck;
 class SpellCheckProvider;
 class VisitedLinkSlave;
 
@@ skipping 73 matching lines @@
   bool IsAdblockWithWebRequestInstalled();
   bool IsAdblockPlusWithWebRequestInstalled();
 
   // For testing.
   void SetExtensionDispatcher(ExtensionDispatcher* extension_dispatcher);
 
   // Called in low-memory conditions to dump the memory used by the spellchecker
   // and start over.
   void OnPurgeMemory();
 
+  void SetImageSettingRules(
+      const ContentSettingsForOneType* image_setting_rules);
+
  private:
   WebKit::WebPlugin* CreatePlugin(
       content::RenderView* render_view,
       WebKit::WebFrame* frame,
       const WebKit::WebPluginParams& params);
 
   WebKit::WebPlugin* CreatePluginPlaceholder(
       content::RenderView* render_view,
       WebKit::WebFrame* frame,
       const webkit::WebPluginInfo& plugin,
@@ skipping 21 matching lines @@
   scoped_ptr<ChromeRenderProcessObserver> chrome_observer_;
   scoped_ptr<ExtensionDispatcher> extension_dispatcher_;
   scoped_ptr<RendererHistogramSnapshots> histogram_snapshots_;
   scoped_ptr<RendererNetPredictor> net_predictor_;
   scoped_ptr<SpellCheck> spellcheck_;
   // The SpellCheckProvider is a RenderViewObserver, and handles its own
   // destruction.
   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
 
 #endif  // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_