Clean up WebSocketClientPtr from WebSocket

This CL cleans up WebSocketClientPtr from WebSocket. It uses
Remote<mojom::WebSocketClient> and BindNewPipeAndPassReceiver
instead of WebSocketClientPtr and MakeRequest.

Bug: 955171, 978694
Change-Id: I67e31eb7d222ba500b510eced7e78cc248756885
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1773019
Commit-Queue: Julie Kim <jkim@igalia.com>
Reviewed-by: Yutaka Hirano <yhirano@chromium.org>
Reviewed-by: Ken Rockot <rockot@google.com>
Cr-Commit-Position: refs/heads/master@{#691484}

services/network/websocket.cc

@@ -185,12 +185,12 @@ void WebSocket::WebSocketEventHandler::OnAddChannelResponse(
   DCHECK_EQ(mojo_result, MOJO_RESULT_OK);
 
   impl_->handshake_client_->OnConnectionEstablished(
-      std::move(websocket_to_pass), mojo::MakeRequest(&impl_->client_),
+      std::move(websocket_to_pass), impl_->client_.BindNewPipeAndPassReceiver(),
       selected_protocol, extensions, std::move(readable));
   impl_->handshake_client_.reset();
   impl_->auth_handler_ = nullptr;
   impl_->header_client_.reset();
-  impl_->client_.set_connection_error_handler(base::BindOnce(
+  impl_->client_.set_disconnect_handler(base::BindOnce(
       &WebSocket::OnConnectionError, base::Unretained(impl_), FROM_HERE));
 }
 
@@ -690,7 +690,7 @@ void WebSocket::OnHeadersReceivedComplete(
 
 void WebSocket::Reset() {
   handshake_client_.reset();
-  client_ = nullptr;
+  client_.reset();
   auth_handler_ = nullptr;
   header_client_.reset();
   binding_.Close();

services/network/websocket.h

@@ -151,7 +151,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) WebSocket : public mojom::WebSocket {
   mojo::Binding<mojom::WebSocket> binding_;
 
   mojo::Remote<mojom::WebSocketHandshakeClient> handshake_client_;
-  mojom::WebSocketClientPtr client_;
+  mojo::Remote<mojom::WebSocketClient> client_;
   mojom::AuthenticationHandlerPtr auth_handler_;
   mojo::Remote<mojom::TrustedHeaderClient> header_client_;