[prerender] rename the module name of PrerenderCanceler.mojom

This CL renames the module name of PrerenderCanceler.mojom from
components.prerender.common.mojom to prerender.mojom to consistent
with most of the other components, and this is a precursor CL to
mojofy PrerenderMsg_SetIsPrerendering.

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

chrome/browser/chrome_browser_interface_binders.cc

@@ -265,8 +265,7 @@ void BindDistillerJavaScriptService(
 
 void BindPrerenderCanceler(
     content::RenderFrameHost* frame_host,
-    mojo::PendingReceiver<
-        components::prerender::common::mojom::PrerenderCanceler> receiver) {
+    mojo::PendingReceiver<prerender::mojom::PrerenderCanceler> receiver) {
   auto* web_contents = content::WebContents::FromRenderFrameHost(frame_host);
   if (!web_contents)
     return;
@@ -376,7 +375,7 @@ void PopulateChromeFrameBinders(
   map->Add<dom_distiller::mojom::DistillerJavaScriptService>(
       base::BindRepeating(&BindDistillerJavaScriptService));
 
-  map->Add<components::prerender::common::mojom::PrerenderCanceler>(
+  map->Add<prerender::mojom::PrerenderCanceler>(
       base::BindRepeating(&BindPrerenderCanceler));
 
   map->Add<blink::mojom::PrerenderProcessor>(

chrome/browser/chrome_content_browser_client.cc

@@ -934,10 +934,9 @@ bool URLHasExtensionBackgroundPermission(
 
 #endif
 
-mojo::PendingRemote<components::prerender::common::mojom::PrerenderCanceler>
-GetPrerenderCanceler(const base::Callback<content::WebContents*()>& wc_getter) {
-  mojo::PendingRemote<components::prerender::common::mojom::PrerenderCanceler>
-      canceler;
+mojo::PendingRemote<prerender::mojom::PrerenderCanceler> GetPrerenderCanceler(
+    const base::Callback<content::WebContents*()>& wc_getter) {
+  mojo::PendingRemote<prerender::mojom::PrerenderCanceler> canceler;
   prerender::PrerenderContents::FromWebContents(wc_getter.Run())
       ->AddPrerenderCancelerReceiver(canceler.InitWithNewPipeAndPassReceiver());
   return canceler;

chrome/browser/prerender/prerender_contents.cc

@@ -644,8 +644,7 @@ void PrerenderContents::CancelPrerenderForUnsupportedScheme(const GURL& url) {
 }
 
 void PrerenderContents::AddPrerenderCancelerReceiver(
-    mojo::PendingReceiver<
-        components::prerender::common::mojom::PrerenderCanceler> receiver) {
+    mojo::PendingReceiver<prerender::mojom::PrerenderCanceler> receiver) {
   prerender_canceler_receiver_set_.Add(this, std::move(receiver));
 }
 

chrome/browser/prerender/prerender_contents.h

@@ -54,10 +54,9 @@ namespace prerender {
 
 class PrerenderManager;
 
-class PrerenderContents
-    : public content::NotificationObserver,
-      public content::WebContentsObserver,
-      public components::prerender::common::mojom::PrerenderCanceler {
+class PrerenderContents : public content::NotificationObserver,
+                          public content::WebContentsObserver,
+                          public prerender::mojom::PrerenderCanceler {
  public:
   // PrerenderContents::Create uses the currently registered Factory to create
   // the PrerenderContents. Factory is intended for testing.
@@ -234,8 +233,7 @@ class PrerenderContents
   int64_t network_bytes() { return network_bytes_; }
 
   void AddPrerenderCancelerReceiver(
-      mojo::PendingReceiver<
-          components::prerender::common::mojom::PrerenderCanceler> receiver);
+      mojo::PendingReceiver<prerender::mojom::PrerenderCanceler> receiver);
 
  protected:
   PrerenderContents(PrerenderManager* prerender_manager,
@@ -292,10 +290,10 @@ class PrerenderContents
       bool success,
       std::unique_ptr<memory_instrumentation::GlobalMemoryDump> dump);
 
-  // components::prerender::common::mojom::PrerenderCanceler:
+  // prerender::mojom::PrerenderCanceler:
   void CancelPrerenderForUnsupportedScheme(const GURL& url) override;
 
-  mojo::ReceiverSet<components::prerender::common::mojom::PrerenderCanceler>
+  mojo::ReceiverSet<prerender::mojom::PrerenderCanceler>
       prerender_canceler_receiver_set_;
 
   base::ObserverList<Observer>::Unchecked observer_list_;

chrome/common/prerender_url_loader_throttle.cc

@@ -24,11 +24,9 @@ const char kPurposeHeaderName[] = "Purpose";
 const char kPurposeHeaderValue[] = "prefetch";
 
 void CallCancelPrerenderForUnsupportedScheme(
-    mojo::PendingRemote<components::prerender::common::mojom::PrerenderCanceler>
-        canceler,
+    mojo::PendingRemote<prerender::mojom::PrerenderCanceler> canceler,
     const GURL& url) {
-  mojo::Remote<components::prerender::common::mojom::PrerenderCanceler>(
-      std::move(canceler))
+  mojo::Remote<prerender::mojom::PrerenderCanceler>(std::move(canceler))
       ->CancelPrerenderForUnsupportedScheme(url);
 }
 
@@ -43,8 +41,7 @@ bool IsNoStoreResponse(const network::mojom::URLResponseHead& response_head) {
 PrerenderURLLoaderThrottle::PrerenderURLLoaderThrottle(
     PrerenderMode mode,
     const std::string& histogram_prefix,
-    mojo::PendingRemote<components::prerender::common::mojom::PrerenderCanceler>
-        canceler)
+    mojo::PendingRemote<prerender::mojom::PrerenderCanceler> canceler)
     : mode_(mode),
       histogram_prefix_(histogram_prefix),
       canceler_(std::move(canceler)) {

chrome/common/prerender_url_loader_throttle.h

@@ -25,8 +25,7 @@ class PrerenderURLLoaderThrottle
   PrerenderURLLoaderThrottle(
       PrerenderMode mode,
       const std::string& histogram_prefix,
-      mojo::PendingRemote<
-          components::prerender::common::mojom::PrerenderCanceler> canceler);
+      mojo::PendingRemote<prerender::mojom::PrerenderCanceler> canceler);
   ~PrerenderURLLoaderThrottle() override;
 
   // Called when the prerender is used. This will unpaused requests and set the
@@ -62,8 +61,7 @@ class PrerenderURLLoaderThrottle
   int redirect_count_ = 0;
   blink::mojom::ResourceType resource_type_;
 
-  mojo::PendingRemote<components::prerender::common::mojom::PrerenderCanceler>
-      canceler_;
+  mojo::PendingRemote<prerender::mojom::PrerenderCanceler> canceler_;
 
   // The throttle changes most request priorities to IDLE during prerendering.
   // The priority is reset back to the original priority when prerendering is

chrome/renderer/prerender/prerender_helper.cc

@@ -43,8 +43,7 @@ std::unique_ptr<blink::URLLoaderThrottle> PrerenderHelper::MaybeCreateThrottle(
   if (!prerender_helper)
     return nullptr;
 
-  mojo::PendingRemote<components::prerender::common::mojom::PrerenderCanceler>
-      canceler;
+  mojo::PendingRemote<prerender::mojom::PrerenderCanceler> canceler;
   render_frame->GetBrowserInterfaceBroker()->GetInterface(
       canceler.InitWithNewPipeAndPassReceiver());
 

components/prerender/common/prerender_canceler.mojom

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-module components.prerender.common.mojom;
+module prerender.mojom;
 
 import "url/mojom/url.mojom";