Convert PrefetchedSignedExchangeInfo to new mojo types.

Bug: 955171, 984550
Change-Id: I5d8429c414e5cc4593cd7f3823da180a0cd47510
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1742777Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Lucas Gadani <lfg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#685193}

content/browser/web_package/prefetched_signed_exchange_cache.cc

@@ -19,6 +19,7 @@
 #include "content/public/common/content_features.h"
 #include "content/public/common/navigation_policy.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
+#include "mojo/public/cpp/bindings/pending_remote.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_util.h"
@@ -731,14 +732,14 @@ PrefetchedSignedExchangeCache::GetInfoListForNavigation(
     // same origin.
     if (outer_url_origin.IsSameOriginWith(
             url::Origin::Create(exchange->outer_url()))) {
-      network::mojom::URLLoaderFactoryPtrInfo loader_factory_info;
+      mojo::PendingRemote<network::mojom::URLLoaderFactory> loader_factory_info;
       new SubresourceSignedExchangeURLLoaderFactory(
-          mojo::MakeRequest(&loader_factory_info), exchange->Clone(),
-          request_initiator_site_lock);
+          loader_factory_info.InitWithNewPipeAndPassReceiver(),
+          exchange->Clone(), request_initiator_site_lock);
       info_list.emplace_back(mojom::PrefetchedSignedExchangeInfo::New(
           exchange->outer_url(), *exchange->header_integrity(),
           exchange->inner_url(), *exchange->inner_response(),
-          std::move(loader_factory_info).PassHandle()));
+          std::move(loader_factory_info)));
     }
     ++exchanges_it;
   }

content/common/navigation_params_mojom_traits.h

@@ -7,6 +7,7 @@
 
 #include "content/common/prefetched_signed_exchange_info.mojom.h"
 #include "mojo/public/cpp/bindings/clone_traits.h"
+#include "services/network/public/mojom/url_loader_factory.mojom.h"
 
 namespace mojo {
 
@@ -17,7 +18,7 @@ struct CloneTraits<content::mojom::PrefetchedSignedExchangeInfoPtr, true> {
     return content::mojom::PrefetchedSignedExchangeInfo::New(
         mojo::Clone(input->outer_url), mojo::Clone(input->header_integrity),
         mojo::Clone(input->inner_url), mojo::Clone(input->inner_response),
-        ScopedMessagePipeHandle());
+        mojo::PendingRemote<network::mojom::URLLoaderFactory>());
   }
 };
 

content/common/prefetched_signed_exchange_info.mojom

@@ -4,6 +4,7 @@
 
 module content.mojom;
 
+import "services/network/public/mojom/url_loader_factory.mojom";
 import "services/network/public/mojom/url_loader.mojom";
 import "url/mojom/url.mojom";
 
@@ -19,5 +20,5 @@ struct PrefetchedSignedExchangeInfo {
   SHA256HashValue header_integrity;
   url.mojom.Url inner_url;
   network.mojom.URLResponseHead inner_response;
-  handle<message_pipe> loader_factory_handle;
+  pending_remote<network.mojom.URLLoaderFactory> loader_factory_handle;
 };

content/renderer/render_frame_impl.cc

@@ -509,7 +509,7 @@ void FillNavigationParamsRequest(
                   signed_exchange_utils::CreateHeaderIntegrityHashString(
                       exchange->header_integrity)),
               exchange->inner_url, web_response,
-              std::move(exchange->loader_factory_handle)));
+              std::move(exchange->loader_factory_handle).PassPipe()));
     }
   }