Convert AssociatedInterfacePtr to AssociateRemote in net_error_helper

This is a followup of http://crrev/c/1685837. See more at
https://docs.google.com/document/d/1Jwfbzbe8ozaoilhqj5mAPYbYGpgZCen_XAAAdwmyP1E/edit

Bug: 955171
Change-Id: I8db6d8816f62f6fe864e3ea35269a223a1fd7f57
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1790132Reviewed-by: Matt Menke <mmenke@chromium.org>
Reviewed-by: Carlos IL <carlosil@chromium.org>
Commit-Queue: Shimi Zhang <ctzsm@chromium.org>
Cr-Commit-Position: refs/heads/master@{#694947}

chrome/renderer/net/net_error_helper.cc

@@ -211,7 +211,8 @@ content::RenderFrame* NetErrorHelper::GetRenderFrame() {
 
 void NetErrorHelper::SendCommand(
     security_interstitials::SecurityInterstitialCommand command) {
-  security_interstitials::mojom::InterstitialCommandsAssociatedPtr interface;
+  mojo::AssociatedRemote<security_interstitials::mojom::InterstitialCommands>
+      interface;
   render_frame()->GetRemoteAssociatedInterfaces()->GetInterface(&interface);
   switch (command) {
     case security_interstitials::CMD_DONT_PROCEED: {
@@ -437,8 +438,10 @@ void NetErrorHelper::EnablePageHelperFunctions() {
   NetErrorPageController::Install(
       render_frame(), weak_controller_delegate_factory_.GetWeakPtr());
 
-  render_frame()->GetRemoteAssociatedInterfaces()->GetInterface(
-      &supervised_user_interface_);
+  if (!supervised_user_interface_) {
+    render_frame()->GetRemoteAssociatedInterfaces()->GetInterface(
+        &supervised_user_interface_);
+  }
   SupervisedUserErrorPageController::Install(
       render_frame(),
       weak_supervised_user_error_controller_delegate_factory_.GetWeakPtr());
@@ -634,13 +637,15 @@ void NetErrorHelper::OnTrackingRequestComplete(
 }
 
 void NetErrorHelper::OnNetworkDiagnosticsClientRequest(
-    chrome::mojom::NetworkDiagnosticsClientAssociatedRequest request) {
-  network_diagnostics_client_bindings_.AddBinding(this, std::move(request));
+    mojo::PendingAssociatedReceiver<chrome::mojom::NetworkDiagnosticsClient>
+        receiver) {
+  network_diagnostics_client_receivers_.Add(this, std::move(receiver));
 }
 
 void NetErrorHelper::OnNavigationCorrectorRequest(
-    chrome::mojom::NavigationCorrectorAssociatedRequest request) {
-  navigation_corrector_bindings_.AddBinding(this, std::move(request));
+    mojo::PendingAssociatedReceiver<chrome::mojom::NavigationCorrector>
+        receiver) {
+  navigation_corrector_receivers_.Add(this, std::move(receiver));
 }
 
 void NetErrorHelper::SetCanShowNetworkDiagnosticsDialog(bool can_show) {

chrome/renderer/net/net_error_helper.h

@@ -27,7 +27,9 @@
 #include "content/public/renderer/render_frame_observer.h"
 #include "content/public/renderer/render_frame_observer_tracker.h"
 #include "content/public/renderer/render_thread_observer.h"
-#include "mojo/public/cpp/bindings/associated_binding_set.h"
+#include "mojo/public/cpp/bindings/associated_receiver_set.h"
+#include "mojo/public/cpp/bindings/associated_remote.h"
+#include "mojo/public/cpp/bindings/pending_associated_receiver.h"
 #include "net/base/net_errors.h"
 
 class GURL;
@@ -165,9 +167,11 @@ class NetErrorHelper
   void OnTrackingRequestComplete(std::unique_ptr<std::string> response_body);
 
   void OnNetworkDiagnosticsClientRequest(
-      chrome::mojom::NetworkDiagnosticsClientAssociatedRequest request);
+      mojo::PendingAssociatedReceiver<chrome::mojom::NetworkDiagnosticsClient>
+          receiver);
   void OnNavigationCorrectorRequest(
-      chrome::mojom::NavigationCorrectorAssociatedRequest request);
+      mojo::PendingAssociatedReceiver<chrome::mojom::NavigationCorrector>
+          receiver);
 
   // chrome::mojom::NetworkDiagnosticsClient:
   void SetCanShowNetworkDiagnosticsDialog(bool can_show) override;
@@ -185,14 +189,16 @@ class NetErrorHelper
 
   std::unique_ptr<NetErrorHelperCore> core_;
 
-  mojo::AssociatedBindingSet<chrome::mojom::NetworkDiagnosticsClient>
-      network_diagnostics_client_bindings_;
-  chrome::mojom::NetworkDiagnosticsAssociatedPtr remote_network_diagnostics_;
-  mojo::AssociatedBindingSet<chrome::mojom::NavigationCorrector>
-      navigation_corrector_bindings_;
-  chrome::mojom::NetworkEasterEggAssociatedPtr remote_network_easter_egg_;
+  mojo::AssociatedReceiverSet<chrome::mojom::NetworkDiagnosticsClient>
+      network_diagnostics_client_receivers_;
+  mojo::AssociatedRemote<chrome::mojom::NetworkDiagnostics>
+      remote_network_diagnostics_;
+  mojo::AssociatedReceiverSet<chrome::mojom::NavigationCorrector>
+      navigation_corrector_receivers_;
+  mojo::AssociatedRemote<chrome::mojom::NetworkEasterEgg>
+      remote_network_easter_egg_;
 
-  supervised_user::mojom::SupervisedUserCommandsAssociatedPtr
+  mojo::AssociatedRemote<supervised_user::mojom::SupervisedUserCommands>
       supervised_user_interface_;
 
   // Weak factories for vending weak pointers to PageControllers. Weak