Small refresh of mojo in SystemNetworkContextManager

Change-Id: Ifac25877bca4754e58e13037a94457b48ffe1e2c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

2 files changed, 10 insertions, 6 deletions

diff --git a/src/core/net/system_network_context_manager.cpp b/src/core/net/system_network_context_manager.cpp
index 43b2b2557..29cc82abf 100644
--- a/src/core/net/system_network_context_manager.cpp
+++ b/src/core/net/system_network_context_manager.cpp
@@ -166,7 +166,8 @@ private:
 
 network::mojom::NetworkContext *SystemNetworkContextManager::GetContext()
 {
-    if (!network_service_network_context_ || network_service_network_context_.encountered_error()) {
+    if (!network_service_network_context_ ||
+        !network_service_network_context_.is_connected()) {
         // This should call into OnNetworkServiceCreated(), which will re-create
         // the network service, if needed. There's a chance that it won't be
         // invoked, if the NetworkContext has encountered an error but the
@@ -182,14 +183,14 @@ network::mojom::NetworkContext *SystemNetworkContextManager::GetContext()
 network::mojom::URLLoaderFactory *SystemNetworkContextManager::GetURLLoaderFactory()
 {
     // Create the URLLoaderFactory as needed.
-    if (url_loader_factory_ && !url_loader_factory_.encountered_error()) {
+    if (url_loader_factory_ && url_loader_factory_.is_connected()) {
         return url_loader_factory_.get();
     }
 
     network::mojom::URLLoaderFactoryParamsPtr params = network::mojom::URLLoaderFactoryParams::New();
     params->process_id = network::mojom::kBrowserProcessId;
     params->is_corb_enabled = false;
-    GetContext()->CreateURLLoaderFactory(mojo::MakeRequest(&url_loader_factory_), std::move(params));
+    GetContext()->CreateURLLoaderFactory(url_loader_factory_.BindNewPipeAndPassReceiver(), std::move(params));
     return url_loader_factory_.get();
 }
 
@@ -252,7 +253,10 @@ void SystemNetworkContextManager::OnNetworkServiceCreated(network::mojom::Networ
 
     // The system NetworkContext must be created first, since it sets
     // |primary_network_context| to true.
-    network_service->CreateNetworkContext(MakeRequest(&network_service_network_context_), CreateNetworkContextParams());
+    network_service_network_context_.reset();
+    network_service->CreateNetworkContext(
+        network_service_network_context_.BindNewPipeAndPassReceiver(),
+        CreateNetworkContextParams());
 
     // Configure the stub resolver. This must be done after the system
     // NetworkContext is created, but before anything has the chance to use it.
diff --git a/src/core/net/system_network_context_manager.h b/src/core/net/system_network_context_manager.h
index e429453a2..5094008f2 100644
--- a/src/core/net/system_network_context_manager.h
+++ b/src/core/net/system_network_context_manager.h
@@ -167,12 +167,12 @@ private:
 
     // NetworkContext using the network service, if the network service is
     // enabled. nullptr, otherwise.
-    network::mojom::NetworkContextPtr network_service_network_context_;
+    mojo::Remote<network::mojom::NetworkContext> network_service_network_context_;
 
     // URLLoaderFactory backed by the NetworkContext returned by GetContext(), so
     // consumers don't all need to create their own factory.
     scoped_refptr<URLLoaderFactoryForSystem> shared_url_loader_factory_;
-    network::mojom::URLLoaderFactoryPtr url_loader_factory_;
+    mojo::Remote<network::mojom::URLLoaderFactory> url_loader_factory_;
 
     ProxyConfigMonitor proxy_config_monitor_;