Remove kInstantProcess from renderer ContentSettingsObserver

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 15 matching lines @@
 class Dispatcher;
 class Extension;
 }
 
 // Handles blocking content per content settings for each RenderFrame.
 class ContentSettingsObserver
     : public content::RenderFrameObserver,
       public content::RenderFrameObserverTracker<ContentSettingsObserver>,
       public blink::WebPermissionClient {
  public:
   ContentSettingsObserver(content::RenderFrame* render_frame,

[jochen (gone - plz use gerrit), 2014/12/12 14:58:20]

please add a comment what should_whitelist means

-                          extensions::Dispatcher* extension_dispatcher);
+                          extensions::Dispatcher* extension_dispatcher,
+                          bool should_whitelist);
   ~ContentSettingsObserver() override;
 
   // 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);
 
@@ skipping 64 matching lines @@
   bool IsPlatformApp();
 
 #if defined(ENABLE_EXTENSIONS)
   // If |origin| corresponds to an installed extension, returns that extension.
   // Otherwise returns NULL.
   const extensions::Extension* GetExtension(
       const blink::WebSecurityOrigin& origin) const;
 #endif
 
   // Helpers.
-  // True if |frame| contains content that is white-listed for content settings.
-  static bool IsWhitelistedForContentSettings(content::RenderFrame* frame);
+  // True if |render_frame()| contains content that is white-listed for content
+  // settings.
+  bool IsWhitelistedForContentSettings() const;
   static bool IsWhitelistedForContentSettings(
       const blink::WebSecurityOrigin& origin,
       const GURL& document_url);
 
 #if defined(ENABLE_EXTENSIONS)
   // Owned by ChromeContentRendererClient and outlive us.
   extensions::Dispatcher* extension_dispatcher_;
 #endif
 
   // Insecure content may be permitted for the duration of this render view.
@@ skipping 17 matching lines @@
   std::map<blink::WebFrame*, bool> cached_script_permissions_;
 
   std::set<std::string> temporarily_allowed_plugins_;
   bool is_interstitial_page_;
   bool npapi_plugins_blocked_;
 
   int current_request_id_;
   typedef std::map<int, blink::WebPermissionCallbacks> PermissionRequestMap;
   PermissionRequestMap permission_requests_;
 
+  // If true, IsWhitelistedForContentSettings will always return true.
+  const bool should_whitelist_;
+
   DISALLOW_COPY_AND_ASSIGN(ContentSettingsObserver);
 };
 
 #endif  // CHROME_RENDERER_CONTENT_SETTINGS_OBSERVER_H_