ContentSettings API should not interact with <webview>

chrome/renderer/content_settings_observer.h

 // Copyright (c) 2012 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_CONTENT_SETTINGS_OBSERVER_H_
 #define CHROME_RENDERER_CONTENT_SETTINGS_OBSERVER_H_
 
 #include <map>
 #include <set>
 
@@ skipping 10 matching lines @@
 }
 
 // Handles blocking content per content settings for each RenderView.
 class ContentSettingsObserver
     : public content::RenderViewObserver,
       public content::RenderViewObserverTracker<ContentSettingsObserver> {
  public:
   explicit ContentSettingsObserver(content::RenderView* render_view);
   virtual ~ContentSettingsObserver();
 
-  // Sets the content setting rules which back |AllowImage()|, |AllowScript()|,
-  // and |AllowScriptFromSource()|. |content_setting_rules| must outlive this
-  // |ContentSettingsObserver|.
-  void SetContentSettingRules(
-      const RendererContentSettingRules* content_setting_rules);
-
   bool IsPluginTemporarilyAllowed(const std::string& identifier);
 
   // 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),
   // otherwise it's the empty string.
   void DidBlockContentType(ContentSettingsType settings_type,
                            const std::string& resource_identifier);
 
   // These correspond to blink::WebPermissionClient methods.
@@ skipping 19 matching lines @@
   void DidNotAllowMixedScript();
 
   // These two methods are not related to content settings, they are used
   // for cases when the NPAPI plugins malfunction if used.
   void BlockNPAPIPlugins();
   bool AreNPAPIPluginsBlocked() const;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(ContentSettingsObserverTest, WhitelistedSchemes);
   FRIEND_TEST_ALL_PREFIXES(ChromeRenderViewTest,
+                           ContentSettingsAllowScripts);
+  FRIEND_TEST_ALL_PREFIXES(ChromeRenderViewTest,
+                           JSBlockSentAfterPageLoad);
+  FRIEND_TEST_ALL_PREFIXES(ChromeRenderViewTest,
+                           ImagesBlockedByDefault);
+  FRIEND_TEST_ALL_PREFIXES(ChromeRenderViewTest,
+                           ImagesAllowedByDefault);
+  FRIEND_TEST_ALL_PREFIXES(ChromeRenderViewTest,
+                           ContentSettingsBlockScripts);
+  FRIEND_TEST_ALL_PREFIXES(ChromeRenderViewTest,
                            ContentSettingsInterstitialPages);
 
   // RenderViewObserver implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void DidCommitProvisionalLoad(blink::WebFrame* frame,
                                         bool is_new_navigation) OVERRIDE;
 
   // Message handlers.
   void OnLoadBlockedPlugins(const std::string& identifier);
   void OnSetAsInterstitial();
+  void OnSetContentSettingRules(const RendererContentSettingRules& rules);
 
   // Resets the |content_blocked_| array.
   void ClearBlockedContentSettings();
 
   // Helpers.
   // True if |frame| contains content that is white-listed for content settings.
   static bool IsWhitelistedForContentSettings(blink::WebFrame* frame);
   static bool IsWhitelistedForContentSettings(
       const blink::WebSecurityOrigin& origin,
       const GURL& document_url);
 
   // A pointer to content setting rules stored by the renderer. Normally, the
   // |RendererContentSettingRules| object is owned by
   // |ChromeRenderProcessObserver|. In the tests it is owned by the caller of
   // |SetContentSettingRules|.
-  const RendererContentSettingRules* content_setting_rules_;
+  scoped_ptr<RendererContentSettingRules> content_setting_rules_;
 
   // Stores if images, scripts, and plugins have actually been blocked.
   bool content_blocked_[CONTENT_SETTINGS_NUM_TYPES];
 
   // Caches the result of AllowStorage.
   typedef std::pair<GURL, bool> StoragePermissionsKey;
   std::map<StoragePermissionsKey, bool> cached_storage_permissions_;
 
   // Caches the result of |AllowScript|.
   std::map<blink::WebFrame*, bool> cached_script_permissions_;
 
   std::set<std::string> temporarily_allowed_plugins_;
   bool is_interstitial_page_;
   bool npapi_plugins_blocked_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentSettingsObserver);
 };
 
 #endif  // CHROME_RENDERER_CONTENT_SETTINGS_OBSERVER_H_