Convert OfflinePageAutoFetcher to new Mojo types

This CL converts OfflinePageAutoFetcher to new mojo types
using Remote, PendingRemote, ReceiverSet, and PendingReceiver.

Bug: 955171
Change-Id: I1747f4bd5830a1a077fba86466e372807171f939
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1828757Reviewed-by: Cathy Li <chili@chromium.org>
Reviewed-by: Ken Rockot <rockot@google.com>
Commit-Queue: Julie Kim <jkim@igalia.com>
Cr-Commit-Position: refs/heads/master@{#700931}

chrome/browser/offline_pages/android/offline_page_auto_fetcher.cc

@@ -14,7 +14,7 @@
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
-#include "mojo/public/cpp/bindings/strong_binding.h"
+#include "mojo/public/cpp/bindings/self_owned_receiver.h"
 #include "url/gurl.h"
 
 namespace offline_pages {
@@ -72,13 +72,13 @@ void OfflinePageAutoFetcher::CancelSchedule() {
 
 // static
 void OfflinePageAutoFetcher::Create(
-    chrome::mojom::OfflinePageAutoFetcherRequest request,
+    mojo::PendingReceiver<chrome::mojom::OfflinePageAutoFetcher> receiver,
     content::RenderFrameHost* render_frame_host) {
-  // Lifetime of the strong binding can exceed the render frame host, so
+  // Lifetime of the self owned receiver can exceed the render frame host, so
   // OfflinePageAutoFetcher does not retain a reference.
-  mojo::MakeStrongBinding(
+  mojo::MakeSelfOwnedReceiver(
       std::make_unique<OfflinePageAutoFetcher>(render_frame_host),
-      std::move(request));
+      std::move(receiver));
 }
 
 }  // namespace offline_pages

chrome/browser/offline_pages/android/offline_page_auto_fetcher.h

@@ -13,6 +13,7 @@
 #include "chrome/common/offline_page_auto_fetcher.mojom.h"
 #include "components/offline_pages/core/background/request_queue_results.h"
 #include "components/offline_pages/core/background/save_page_request.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
 
 namespace content {
 class RenderFrameHost;
@@ -29,8 +30,9 @@ class OfflinePageAutoFetcher : public chrome::mojom::OfflinePageAutoFetcher {
   void TrySchedule(bool user_requested, TryScheduleCallback callback) override;
   void CancelSchedule() override;
 
-  static void Create(chrome::mojom::OfflinePageAutoFetcherRequest request,
-                     content::RenderFrameHost* render_frame_host);
+  static void Create(
+      mojo::PendingReceiver<chrome::mojom::OfflinePageAutoFetcher> receiver,
+      content::RenderFrameHost* render_frame_host);
 
  private:
   OfflinePageAutoFetcherService* GetService();

chrome/renderer/net/net_error_helper_core_unittest.cc

@@ -36,8 +36,8 @@
 #include "content/public/common/service_names.mojom.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/mock_render_thread.h"
-#include "mojo/public/cpp/bindings/binding_set.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
+#include "mojo/public/cpp/bindings/pending_remote.h"
 #include "mojo/public/cpp/bindings/receiver_set.h"
 #include "net/base/net_errors.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -2683,8 +2683,9 @@ class FakeOfflinePageAutoFetcher
 
   void CancelSchedule() override { cancel_calls_++; }
 
-  void AddBinding(chrome::mojom::OfflinePageAutoFetcherRequest request) {
-    bindings_.AddBinding(this, std::move(request));
+  void AddReceiver(
+      mojo::PendingReceiver<chrome::mojom::OfflinePageAutoFetcher> receiver) {
+    receivers_.Add(this, std::move(receiver));
   }
 
   int cancel_calls() const { return cancel_calls_; }
@@ -2695,7 +2696,7 @@ class FakeOfflinePageAutoFetcher
   }
 
  private:
-  mojo::BindingSet<chrome::mojom::OfflinePageAutoFetcher> bindings_;
+  mojo::ReceiverSet<chrome::mojom::OfflinePageAutoFetcher> receivers_;
   int cancel_calls_ = 0;
   std::vector<TryScheduleParameters> try_schedule_calls_;
 
@@ -2706,17 +2707,19 @@ class FakeOfflinePageAutoFetcher
 class TestPageAutoFetcherHelper : public PageAutoFetcherHelper {
  public:
   explicit TestPageAutoFetcherHelper(
-      base::RepeatingCallback<chrome::mojom::OfflinePageAutoFetcherPtr()>
-          binder)
+      base::RepeatingCallback<
+          mojo::PendingRemote<chrome::mojom::OfflinePageAutoFetcher>()> binder)
       : PageAutoFetcherHelper(nullptr), binder_(binder) {}
   bool Bind() override {
     if (!fetcher_)
-      fetcher_ = binder_.Run();
+      fetcher_.Bind(binder_.Run());
     return true;
   }
 
  private:
-  base::RepeatingCallback<chrome::mojom::OfflinePageAutoFetcherPtr()> binder_;
+  base::RepeatingCallback<
+      mojo::PendingRemote<chrome::mojom::OfflinePageAutoFetcher>()>
+      binder_;
 };
 
 // Provides set up for testing the 'auto fetch on dino' feature.
@@ -2725,9 +2728,10 @@ class NetErrorHelperCoreAutoFetchTest : public NetErrorHelperCoreTest {
   void SetUp() override {
     NetErrorHelperCoreTest::SetUp();
     auto binder = base::BindLambdaForTesting([&]() {
-      chrome::mojom::OfflinePageAutoFetcherPtr fetcher_ptr;
-      fake_fetcher_.AddBinding(mojo::MakeRequest(&fetcher_ptr));
-      return fetcher_ptr;
+      mojo::PendingRemote<chrome::mojom::OfflinePageAutoFetcher> fetcher_remote;
+      fake_fetcher_.AddReceiver(
+          fetcher_remote.InitWithNewPipeAndPassReceiver());
+      return fetcher_remote;
     });
 
     core()->SetPageAutoFetcherHelperForTesting(

chrome/renderer/net/page_auto_fetcher_helper_android.cc

@@ -54,6 +54,6 @@ bool PageAutoFetcherHelper::Bind() {
   if (fetcher_)
     return true;
   render_frame_->GetRemoteInterfaces()->GetInterface(
-      mojo::MakeRequest(&fetcher_));
+      fetcher_.BindNewPipeAndPassReceiver());
   return fetcher_.is_bound();
 }

chrome/renderer/net/page_auto_fetcher_helper_android.h

@@ -9,6 +9,7 @@
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/common/offline_page_auto_fetcher.mojom.h"
+#include "mojo/public/cpp/bindings/remote.h"
 
 namespace content {
 class RenderFrame;
@@ -39,7 +40,7 @@ class PageAutoFetcherHelper {
   virtual bool Bind();
 
   content::RenderFrame* render_frame_;
-  chrome::mojom::OfflinePageAutoFetcherPtr fetcher_;
+  mojo::Remote<chrome::mojom::OfflinePageAutoFetcher> fetcher_;
 
   base::WeakPtrFactory<PageAutoFetcherHelper> weak_ptr_factory_{this};