From 8bf4fd93e334098aee67df1e57fa54d509a50a43 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Fri, 20 Sep 2019 18:06:19 -0400 Subject: [PATCH] CreateWebSocket signature change. Chromium change: https://chromium.googlesource.com/chromium/src/+/3e973f964e7712b9ac7ef02f77739f13ae8d1dff commit 3e973f964e7712b9ac7ef02f77739f13ae8d1dff Author: Julie Jeongeun Kim Date: Thu Aug 22 08:02:40 2019 +0000 Convert WebSocketHandshakeClientPtr to new Mojo types This CL converts WebSocketHandshakeClientPtr to new Mojo types. It updates CreateWebSocket from network_context.mojom and Connect from websocket_connector.mojom and methods and members which implements them. Bug: 955171, 978694 --- browser/brave_content_browser_client.cc | 3 ++- browser/brave_content_browser_client.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/browser/brave_content_browser_client.cc b/browser/brave_content_browser_client.cc index ae7d352dca3f..fe62e3618760 100644 --- a/browser/brave_content_browser_client.cc +++ b/browser/brave_content_browser_client.cc @@ -251,7 +251,8 @@ void BraveContentBrowserClient::CreateWebSocket( const GURL& url, const GURL& site_for_cookies, const base::Optional& user_agent, - network::mojom::WebSocketHandshakeClientPtr handshake_client) { + mojo::PendingRemote + handshake_client) { auto* proxy = BraveProxyingWebSocket::ProxyWebSocket( frame, std::move(factory), diff --git a/browser/brave_content_browser_client.h b/browser/brave_content_browser_client.h index e258f91b7895..e6f43d5b8939 100644 --- a/browser/brave_content_browser_client.h +++ b/browser/brave_content_browser_client.h @@ -72,7 +72,8 @@ class BraveContentBrowserClient : public ChromeContentBrowserClient { const GURL& url, const GURL& site_for_cookies, const base::Optional& user_agent, - network::mojom::WebSocketHandshakeClientPtr handshake_client) override; + mojo::PendingRemote + handshake_client) override; void MaybeHideReferrer(content::BrowserContext* browser_context, const GURL& request_url,