Revert 113579 - Content settings: allow scripts on interstitial pages even if JavaScript is blocked.

chrome/renderer/content_settings_observer.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_CONTENT_SETTINGS_OBSERVER_H_
 #define CHROME_RENDERER_CONTENT_SETTINGS_OBSERVER_H_
 #pragma once
 
 #include <map>
 
@@ skipping 47 matching lines @@
                       const WebKit::WebString& name,
                       const WebKit::WebSecurityOrigin& origin);
   bool AllowPlugins(WebKit::WebFrame* frame, bool enabled_per_settings);
   bool AllowScript(WebKit::WebFrame* frame, bool enabled_per_settings);
   bool AllowScriptFromSource(WebKit::WebFrame* frame, bool enabled_per_settings,
                              const WebKit::WebURL& script_url);
   bool AllowStorage(WebKit::WebFrame* frame, bool local);
   void DidNotAllowPlugins(WebKit::WebFrame* frame);
   void DidNotAllowScript(WebKit::WebFrame* frame);
 
-  // Used for allowing scripts and images on views displaying interstitial
-  // pages.
-  void SetAsInterstitial();
-
  private:
   FRIEND_TEST_ALL_PREFIXES(ContentSettingsObserverTest, WhitelistedSchemes);
 
   // RenderViewObserver implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void DidCommitProvisionalLoad(WebKit::WebFrame* frame,
                                         bool is_new_navigation) OVERRIDE;
 
   // Message handlers.
   void OnLoadBlockedPlugins();
@@ skipping 18 matching lines @@
   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<WebKit::WebFrame*, bool> cached_script_permissions_;
 
   bool plugins_temporarily_allowed_;
-  bool is_interstitial_page_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentSettingsObserver);
 };
 
 #endif  // CHROME_RENDERER_CONTENT_SETTINGS_OBSERVER_H_