Delete WebContentObserver::RenderFrameForInterstitialPageCreated.

It is no longer called. Only 1 real implementation existed.

Delete SetAsInterstitial from ContentSettingsAgent, it's unused now.

Change-Id: I995a6944115e192a4c213b8f3689130414458927
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2397110
Commit-Queue: Fergal Daly <fergal@chromium.org>
Reviewed-by: Nasko Oskov <nasko@chromium.org>
Reviewed-by: Martin Šrámek <msramek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#814115}

components/content_settings/browser/page_specific_content_settings.cc

@@ -213,18 +213,6 @@ void PageSpecificContentSettings::WebContentsHandler::OnServiceWorkerAccessed(
     tscs->OnServiceWorkerAccessed(scope, allowed);
 }
 
-void PageSpecificContentSettings::WebContentsHandler::
-    RenderFrameForInterstitialPageCreated(
-        content::RenderFrameHost* render_frame_host) {
-  // We want to tell the renderer-side code to ignore content settings for this
-  // page.
-  mojo::AssociatedRemote<content_settings::mojom::ContentSettingsAgent>
-      content_settings_agent;
-  render_frame_host->GetRemoteAssociatedInterfaces()->GetInterface(
-      &content_settings_agent);
-  content_settings_agent->SetAsInterstitial();
-}
-
 void PageSpecificContentSettings::WebContentsHandler::DidStartNavigation(
     content::NavigationHandle* navigation_handle) {
   if (!WillNavigationCreateNewPageSpecificContentSettingsOnCommit(

components/content_settings/browser/page_specific_content_settings.h

@@ -453,8 +453,6 @@ class PageSpecificContentSettings
         content::RenderFrameHost* rfh);
 
     // content::WebContentsObserver overrides.
-    void RenderFrameForInterstitialPageCreated(
-        content::RenderFrameHost* render_frame_host) override;
     void DidStartNavigation(
         content::NavigationHandle* navigation_handle) override;
     void ReadyToCommitNavigation(

components/content_settings/common/content_settings_agent.mojom

@@ -10,9 +10,6 @@ interface ContentSettingsAgent {
   // main frame, it will also reload the frame afterwards.
   SetAllowRunningInsecureContent();
 
-  // Sent to inform the renderer that it is displaying interstitial page.
-  SetAsInterstitial();
-
   // Sent to inform the renderer automatic upgrades for mixed content are
   // disabled.
   SetDisabledMixedContentUpgrades();

components/content_settings/renderer/content_settings_agent_impl.cc

@@ -126,7 +126,6 @@ ContentSettingsAgentImpl::ContentSettingsAgentImpl(
     ContentSettingsAgentImpl* parent =
         ContentSettingsAgentImpl::Get(main_frame);
     allow_running_insecure_content_ = parent->allow_running_insecure_content_;
-    is_interstitial_page_ = parent->is_interstitial_page_;
   }
 }
 
@@ -240,10 +239,6 @@ void ContentSettingsAgentImpl::SetAllowRunningInsecureContent() {
     frame->StartReload(blink::WebFrameLoadType::kReload);
 }
 
-void ContentSettingsAgentImpl::SetAsInterstitial() {
-  is_interstitial_page_ = true;
-}
-
 void ContentSettingsAgentImpl::SetDisabledMixedContentUpgrades() {
   mixed_content_autoupgrades_disabled_ = true;
 }
@@ -334,9 +329,6 @@ bool ContentSettingsAgentImpl::AllowImage(bool enabled_per_settings,
                                           const WebURL& image_url) {
   bool allow = enabled_per_settings;
   if (enabled_per_settings) {
-    if (is_interstitial_page_)
-      return true;
-
     if (IsAllowlistedForContentSettings())
       return true;
 
@@ -356,8 +348,6 @@ bool ContentSettingsAgentImpl::AllowScript(bool enabled_per_settings) {
     return false;
   if (IsScriptDisabledForPreview(render_frame()))
     return false;
-  if (is_interstitial_page_)
-    return true;
 
   blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
   const auto it = cached_script_permissions_.find(frame);
@@ -387,8 +377,6 @@ bool ContentSettingsAgentImpl::AllowScriptFromSource(
     return false;
   if (IsScriptDisabledForPreview(render_frame()))
     return false;
-  if (is_interstitial_page_)
-    return true;
 
   bool allow = true;
   if (content_setting_rules_) {

components/content_settings/renderer/content_settings_agent_impl.h

@@ -132,7 +132,6 @@ class ContentSettingsAgentImpl
 
   // mojom::ContentSettingsAgent:
   void SetAllowRunningInsecureContent() override;
-  void SetAsInterstitial() override;
   void SetDisabledMixedContentUpgrades() override;
 
   void OnContentSettingsAgentRequest(
@@ -170,7 +169,6 @@ class ContentSettingsAgentImpl
   // Caches the result of AllowScript.
   base::flat_map<blink::WebFrame*, bool> cached_script_permissions_;
 
-  bool is_interstitial_page_ = false;
   bool mixed_content_autoupgrades_disabled_ = false;
 
   // If true, IsAllowlistedForContentSettings will always return true.

components/content_settings/renderer/content_settings_agent_impl_browsertest.cc

@@ -563,43 +563,6 @@ TEST_F(ContentSettingsAgentImplBrowserTest,
   EXPECT_TRUE(agent->AllowScript(true));
 }
 
-TEST_F(ContentSettingsAgentImplBrowserTest, ContentSettingsInterstitialPages) {
-  MockContentSettingsAgentImpl mock_agent(view_->GetMainRenderFrame());
-  // Block scripts.
-  RendererContentSettingRules content_setting_rules;
-  ContentSettingsForOneType& script_setting_rules =
-      content_setting_rules.script_rules;
-  script_setting_rules.push_back(ContentSettingPatternSource(
-      ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(),
-      base::Value::FromUniquePtrValue(
-          content_settings::ContentSettingToValue(CONTENT_SETTING_BLOCK)),
-      std::string(), false));
-  // Block images.
-  ContentSettingsForOneType& image_setting_rules =
-      content_setting_rules.image_rules;
-  image_setting_rules.push_back(ContentSettingPatternSource(
-      ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(),
-      base::Value::FromUniquePtrValue(
-          content_settings::ContentSettingToValue(CONTENT_SETTING_BLOCK)),
-      std::string(), false));
-
-  ContentSettingsAgentImpl* agent =
-      ContentSettingsAgentImpl::Get(view_->GetMainRenderFrame());
-  agent->SetContentSettingRules(&content_setting_rules);
-  agent->SetAsInterstitial();
-
-  // Load a page which contains a script.
-  LoadHTML(kScriptHtml);
-
-  // Verify that the script was allowed.
-  EXPECT_EQ(0, mock_agent.on_content_blocked_count());
-
-  // Verify that images are allowed.
-  EXPECT_TRUE(agent->AllowImage(true, mock_agent.image_url()));
-  base::RunLoop().RunUntilIdle();
-  EXPECT_EQ(0, mock_agent.on_content_blocked_count());
-}
-
 TEST_F(ContentSettingsAgentImplBrowserTest, MixedAutoupgradesDisabledByRules) {
   MockContentSettingsAgentImpl mock_agent(view_->GetMainRenderFrame());
 

content/public/browser/web_contents_observer.h

@@ -112,10 +112,6 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener {
   // interstitial.
   virtual void RenderViewCreated(RenderViewHost* render_view_host) {}
 
-  // Called for every RenderFrameHost that's created for an interstitial.
-  virtual void RenderFrameForInterstitialPageCreated(
-      RenderFrameHost* render_frame_host) {}
-
   // This method is invoked when the RenderView of the current RenderViewHost
   // is ready, e.g. because we recreated it after a crash.
   virtual void RenderViewReady() {}

content/test/web_contents_observer_consistency_checker.cc

@@ -114,11 +114,6 @@ void WebContentsObserverConsistencyChecker::RenderFrameDeleted(
     CHECK_NE(id.render_frame_host, render_frame_host);
 }
 
-void WebContentsObserverConsistencyChecker::
-    RenderFrameForInterstitialPageCreated(RenderFrameHost* render_frame_host) {
-  // TODO(nick): Record this.
-}
-
 void WebContentsObserverConsistencyChecker::RenderFrameHostChanged(
     RenderFrameHost* old_host,
     RenderFrameHost* new_host) {

content/test/web_contents_observer_consistency_checker.h

@@ -44,8 +44,6 @@ class WebContentsObserverConsistencyChecker
   // WebContentsObserver implementation.
   void RenderFrameCreated(RenderFrameHost* render_frame_host) override;
   void RenderFrameDeleted(RenderFrameHost* render_frame_host) override;
-  void RenderFrameForInterstitialPageCreated(
-      RenderFrameHost* render_frame_host) override;
   void RenderFrameHostChanged(RenderFrameHost* old_host,
                               RenderFrameHost* new_host) override;
   void FrameDeleted(RenderFrameHost* render_frame_host) override;