[prerender] Convert PrerenderHostMsg_PrefetchFinished to mojo

This CL converts PrerenderHostMsg_PrefetchFinished to FrameHost
Mojo message and removes the unused PrerenderMessageFilter.

Bug: 798712
Change-Id: I72721a011ebfb9951f4e7c01a96e09139f3c5e48
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2256116
Commit-Queue: Miyoung Shin <myid.shin@igalia.com>
Reviewed-by: Dave Tapuska <dtapuska@chromium.org>
Reviewed-by: Darin Fisher <darin@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#783862}

chrome/browser/BUILD.gn

@@ -1286,8 +1286,6 @@ static_library("browser") {
     "prerender/prerender_manager.h",
     "prerender/prerender_manager_factory.cc",
     "prerender/prerender_manager_factory.h",
-    "prerender/prerender_message_filter.cc",
-    "prerender/prerender_message_filter.h",
     "prerender/prerender_processor_impl.cc",
     "prerender/prerender_processor_impl.h",
     "prerender/prerender_tab_helper.cc",

chrome/browser/chrome_content_browser_client.cc

@@ -96,7 +96,6 @@
 #include "chrome/browser/prerender/isolated/isolated_prerender_url_loader_interceptor.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
-#include "chrome/browser/prerender/prerender_message_filter.h"
 #include "chrome/browser/prerender/prerender_util.h"
 #include "chrome/browser/previews/previews_content_util.h"
 #include "chrome/browser/previews/previews_service.h"
@@ -1506,7 +1505,6 @@ void ChromeContentBrowserClient::RenderProcessWillLaunch(
 #if BUILDFLAG(ENABLE_PRINTING)
   host->AddFilter(new printing::PrintingMessageFilter(id, profile));
 #endif
-  host->AddFilter(new prerender::PrerenderMessageFilter(id));
 
   WebRtcLoggingController::AttachToRenderProcessHost(
       host, g_browser_process->webrtc_log_uploader());

chrome/browser/prerender/prerender_contents.cc

@@ -30,7 +30,6 @@
 #include "chrome/common/prerender_util.h"
 #include "components/history/core/browser/history_types.h"
 #include "components/prerender/common/prerender_final_status.h"
-#include "components/prerender/common/prerender_messages.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_handle.h"
@@ -650,10 +649,14 @@ void PrerenderContents::PrepareForUse() {
   NotifyPrerenderStop();
 }
 
-void PrerenderContents::CancelPrerenderForUnsupportedScheme(const GURL& url) {
+void PrerenderContents::CancelPrerenderForUnsupportedScheme() {
   Destroy(FINAL_STATUS_UNSUPPORTED_SCHEME);
 }
 
+void PrerenderContents::CancelPrerenderForNoStatePrefetch() {
+  Destroy(FINAL_STATUS_NOSTATE_PREFETCH_FINISHED);
+}
+
 void PrerenderContents::AddPrerenderCancelerReceiver(
     mojo::PendingReceiver<prerender::mojom::PrerenderCanceler> receiver) {
   prerender_canceler_receiver_set_.Add(this, std::move(receiver));

chrome/browser/prerender/prerender_contents.h

@@ -293,7 +293,8 @@ class PrerenderContents : public content::NotificationObserver,
       std::unique_ptr<memory_instrumentation::GlobalMemoryDump> dump);
 
   // prerender::mojom::PrerenderCanceler:
-  void CancelPrerenderForUnsupportedScheme(const GURL& url) override;
+  void CancelPrerenderForUnsupportedScheme() override;
+  void CancelPrerenderForNoStatePrefetch() override;
 
   mojo::ReceiverSet<prerender::mojom::PrerenderCanceler>
       prerender_canceler_receiver_set_;

chrome/browser/prerender/prerender_message_filter.cc

-// 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.
-
-#include "chrome/browser/prerender/prerender_message_filter.h"
-
-#include "chrome/browser/prerender/prerender_contents.h"
-#include "chrome/browser/prerender/prerender_manager.h"
-#include "chrome/browser/prerender/prerender_manager_factory.h"
-#include "components/prerender/common/prerender_final_status.h"
-#include "components/prerender/common/prerender_messages.h"
-#include "content/public/browser/render_process_host.h"
-
-namespace prerender {
-
-PrerenderMessageFilter::PrerenderMessageFilter(int render_process_id)
-    : BrowserMessageFilter(PrerenderMsgStart),
-      render_process_id_(render_process_id) {}
-
-PrerenderMessageFilter::~PrerenderMessageFilter() = default;
-
-bool PrerenderMessageFilter::OnMessageReceived(const IPC::Message& message) {
-  bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(PrerenderMessageFilter, message)
-    IPC_MESSAGE_HANDLER(PrerenderHostMsg_PrefetchFinished, OnPrefetchFinished)
-    IPC_MESSAGE_UNHANDLED(handled = false)
-  IPC_END_MESSAGE_MAP()
-
-  return handled;
-}
-
-void PrerenderMessageFilter::OverrideThreadForMessage(
-    const IPC::Message& message, content::BrowserThread::ID* thread) {
-  if (message.type() == PrerenderHostMsg_PrefetchFinished::ID)
-    *thread = content::BrowserThread::UI;
-}
-
-void PrerenderMessageFilter::OnPrefetchFinished() {
-  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-
-  content::RenderProcessHost* render_process_host =
-      content::RenderProcessHost::FromID(render_process_id_);
-  if (!render_process_host)
-    return;
-
-  PrerenderManager* prerender_manager =
-      PrerenderManagerFactory::GetForBrowserContext(
-          render_process_host->GetBrowserContext());
-  if (!prerender_manager)
-    return;
-
-  // Kill the process doing the prefetch. Only one prefetch per renderer is
-  // possible, also prefetches are not shared with other renderer processes.
-  PrerenderContents* prerender_contents =
-      prerender_manager->GetPrerenderContentsForProcess(render_process_id_);
-  if (prerender_contents)
-    prerender_contents->Destroy(FINAL_STATUS_NOSTATE_PREFETCH_FINISHED);
-}
-
-}  // namespace prerender
-

chrome/browser/prerender/prerender_message_filter.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_BROWSER_PRERENDER_PRERENDER_MESSAGE_FILTER_H_
-#define CHROME_BROWSER_PRERENDER_PRERENDER_MESSAGE_FILTER_H_
-
-#include <memory>
-
-#include "base/compiler_specific.h"
-#include "base/macros.h"
-#include "content/public/browser/browser_message_filter.h"
-#include "content/public/browser/browser_thread.h"
-#include "url/gurl.h"
-#include "url/origin.h"
-
-namespace IPC {
-class Message;
-}
-
-namespace prerender {
-
-class PrerenderMessageFilter : public content::BrowserMessageFilter {
- public:
-  explicit PrerenderMessageFilter(int render_process_id);
-
- private:
-  friend struct content::BrowserThread::DeleteOnThread<
-      content::BrowserThread::UI>;
-  friend class base::DeleteHelper<PrerenderMessageFilter>;
-
-  ~PrerenderMessageFilter() override;
-
-  // Overridden from content::BrowserMessageFilter.
-  bool OnMessageReceived(const IPC::Message& message) override;
-  void OverrideThreadForMessage(const IPC::Message& message,
-                                content::BrowserThread::ID* thread) override;
-
-  void OnPrefetchFinished();
-
-  const int render_process_id_;
-
-  DISALLOW_COPY_AND_ASSIGN(PrerenderMessageFilter);
-};
-
-}  // namespace prerender
-
-#endif  // CHROME_BROWSER_PRERENDER_PRERENDER_MESSAGE_FILTER_H_
-

chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

@@ -58,7 +58,6 @@
 #include "chrome/browser/prefs/pref_metrics_service.h"
 #include "chrome/browser/prerender/prerender_link_manager_factory.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
-#include "chrome/browser/prerender/prerender_message_filter.h"
 #include "chrome/browser/profiles/gaia_info_update_service_factory.h"
 #include "chrome/browser/profiles/renderer_updater_factory.h"
 #include "chrome/browser/safe_browsing/certificate_reporting_service_factory.h"

chrome/common/common_message_generator.h

@@ -6,12 +6,6 @@
 
 #include "chrome/common/search/instant_mojom_traits.h"
 #include "services/network/public/cpp/p2p_param_traits.h"
-#undef COMPONENTS_PRERENDER_COMMON_PRERENDER_MESSAGES_H_
-#include "components/prerender/common/prerender_messages.h"
-#ifndef COMPONENTS_PRERENDER_COMMON_PRERENDER_MESSAGES_H_
-#error \
-    "Failed to include header components/prerender/common/prerender_messages.h"
-#endif
 #undef CHROME_COMMON_RENDER_MESSAGES_H_
 #include "chrome/common/render_messages.h"
 #ifndef CHROME_COMMON_RENDER_MESSAGES_H_

chrome/common/prerender_url_loader_throttle.cc

@@ -24,10 +24,9 @@ const char kPurposeHeaderName[] = "Purpose";
 const char kPurposeHeaderValue[] = "prefetch";
 
 void CallCancelPrerenderForUnsupportedScheme(
-    mojo::PendingRemote<prerender::mojom::PrerenderCanceler> canceler,
-    const GURL& url) {
+    mojo::PendingRemote<prerender::mojom::PrerenderCanceler> canceler) {
   mojo::Remote<prerender::mojom::PrerenderCanceler>(std::move(canceler))
-      ->CancelPrerenderForUnsupportedScheme(url);
+      ->CancelPrerenderForUnsupportedScheme();
 }
 
 // Returns true if the response has a "no-store" cache control header.
@@ -96,7 +95,7 @@ void PrerenderURLLoaderThrottle::WillStartRequest(
     // WillRedirectRequest() and PrerenderContents::CheckURL(). See
     // http://crbug.com/673771.
     delegate_->CancelWithError(net::ERR_ABORTED);
-    CallCancelPrerenderForUnsupportedScheme(std::move(canceler_), request->url);
+    CallCancelPrerenderForUnsupportedScheme(std::move(canceler_));
     return;
   }
 
@@ -154,8 +153,7 @@ void PrerenderURLLoaderThrottle::WillRedirectRequest(
   // Abort any prerenders with requests which redirect to invalid schemes.
   if (!DoesURLHaveValidScheme(redirect_info->new_url)) {
     delegate_->CancelWithError(net::ERR_ABORTED);
-    CallCancelPrerenderForUnsupportedScheme(std::move(canceler_),
-                                            redirect_info->new_url);
+    CallCancelPrerenderForUnsupportedScheme(std::move(canceler_));
   } else if (follow_only_when_prerender_shown_header == "1" &&
              resource_type_ != blink::mojom::ResourceType::kMainFrame) {
     // Only defer redirects with the Follow-Only-When-Prerender-Shown

chrome/renderer/chrome_render_frame_observer.cc

@@ -29,7 +29,6 @@
 #include "chrome/renderer/web_apps.h"
 #include "components/crash/core/common/crash_key.h"
 #include "components/offline_pages/buildflags/buildflags.h"
-#include "components/prerender/common/prerender_messages.h"
 #include "components/translate/content/renderer/translate_agent.h"
 #include "components/translate/core/common/translate_util.h"
 #include "components/web_cache/renderer/web_cache_impl.h"

chrome/renderer/plugins/chrome_plugin_placeholder.cc

@@ -24,7 +24,6 @@
 #include "chrome/renderer/plugins/plugin_uma.h"
 #include "chrome/renderer/prerender/prerender_observer_list.h"
 #include "components/content_settings/renderer/content_settings_agent_impl.h"
-#include "components/prerender/common/prerender_messages.h"
 #include "components/strings/grit/components_strings.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/untrustworthy_context_menu_params.h"

chrome/renderer/prerender/prerender_helper.cc

@@ -7,7 +7,6 @@
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram_macros.h"
 #include "chrome/common/prerender_url_loader_throttle.h"
-#include "components/prerender/common/prerender_messages.h"
 #include "content/public/renderer/document_state.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_thread.h"
@@ -134,8 +133,11 @@ void PrerenderHelper::SendPrefetchFinished() {
   DCHECK(prefetch_count_ == 0 && prefetch_finished_);
   UMA_HISTOGRAM_MEDIUM_TIMES("Prerender.NoStatePrefetchRendererParseTime",
                              parsed_time_ - start_time_);
-  // TODO(darin): Perhaps this should be a routed message (frame level).
-  content::RenderThread::Get()->Send(new PrerenderHostMsg_PrefetchFinished());
+
+  mojo::Remote<prerender::mojom::PrerenderCanceler> canceler;
+  render_frame()->GetBrowserInterfaceBroker()->GetInterface(
+      canceler.BindNewPipeAndPassReceiver());
+  canceler->CancelPrerenderForNoStatePrefetch();
 }
 
 }  // namespace prerender

components/prerender/common/BUILD.gn

@@ -8,7 +8,6 @@ static_library("common") {
   sources = [
     "prerender_final_status.cc",
     "prerender_final_status.h",
-    "prerender_messages.h",
     "prerender_origin.cc",
     "prerender_origin.h",
   ]

components/prerender/common/prerender_canceler.mojom

@@ -4,12 +4,14 @@
 
 module prerender.mojom;
 
-import "url/mojom/url.mojom";
-
 // This interface is provided to a renderer that is used for prerendering. It
 // enables the renderer to detect and respond to cases that should cause the
 // prerendering to be cancelled.
 interface PrerenderCanceler {
   // Cancels prerendering because of an unsupported scheme.
-  CancelPrerenderForUnsupportedScheme(url.mojom.Url url);
+  CancelPrerenderForUnsupportedScheme();
+
+  // Cancels prerendering because the resource prefetcher has discovered all
+  // possible subresources and issued requests for them.
+  CancelPrerenderForNoStatePrefetch();
 };

components/prerender/common/prerender_messages.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 COMPONENTS_PRERENDER_COMMON_PRERENDER_MESSAGES_H_
-#define COMPONENTS_PRERENDER_COMMON_PRERENDER_MESSAGES_H_
-
-#include "ipc/ipc_message.h"
-#include "ipc/ipc_message_macros.h"
-#include "ipc/ipc_param_traits.h"
-
-#define IPC_MESSAGE_START PrerenderMsgStart
-
-// PrerenderLinkManager Messages
-
-// Sent by the renderer process to notify that the resource prefetcher has
-// discovered all possible subresources and issued requests for them.
-IPC_MESSAGE_CONTROL0(PrerenderHostMsg_PrefetchFinished)
-
-#endif  // COMPONENTS_PRERENDER_COMMON_PRERENDER_MESSAGES_H_

ipc/ipc_message_start.h

@@ -28,7 +28,6 @@ enum IPCMessageStart {
   PrintMsgStart,
   ExtensionMsgStart,
   TextInputClientMsgStart,
-  PrerenderMsgStart,
   ChromotingMsgStart,
   AndroidWebViewMsgStart,
   NaClHostMsgStart,

ipc/trace_ipc_message.cc

@@ -67,9 +67,6 @@ void WriteIpcMessageIdAsProtozero(uint32_t message_id,
     case TextInputClientMsgStart:
       message_class = ChromeLegacyIpc::CLASS_TEXT_INPUT_CLIENT;
       break;
-    case PrerenderMsgStart:
-      message_class = ChromeLegacyIpc::CLASS_PRERENDER;
-      break;
     case ChromotingMsgStart:
       message_class = ChromeLegacyIpc::CLASS_CHROMOTING;
       break;