diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-11 11:32:04 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-18 13:40:17 +0000 |
commit | 31ccca0778db85c159634478b4ec7997f6704860 (patch) | |
tree | 3d33fc3afd9d5ec95541e1bbe074a9cf8da12a0e /chromium/content/browser/network_service_client.cc | |
parent | 248b70b82a40964d5594eb04feca0fa36716185d (diff) | |
download | qtwebengine-chromium-31ccca0778db85c159634478b4ec7997f6704860.tar.gz |
BASELINE: Update Chromium to 80.0.3987.136
Change-Id: I98e1649aafae85ba3a83e67af00bb27ef301db7b
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'chromium/content/browser/network_service_client.cc')
-rw-r--r-- | chromium/content/browser/network_service_client.cc | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/chromium/content/browser/network_service_client.cc b/chromium/content/browser/network_service_client.cc index 754d7054bea..cf2db23b147 100644 --- a/chromium/content/browser/network_service_client.cc +++ b/chromium/content/browser/network_service_client.cc @@ -36,6 +36,10 @@ #include "base/android/content_uri_utils.h" #endif +#if defined(OS_MACOSX) +#include "base/message_loop/message_loop_current.h" +#endif + namespace content { namespace { @@ -74,7 +78,7 @@ NetworkServiceClient::NetworkServiceClient( #if defined(OS_ANDROID) DCHECK(!net::NetworkChangeNotifier::CreateIfNeeded()); GetNetworkService()->GetNetworkChangeManager( - mojo::MakeRequest(&network_change_manager_)); + network_change_manager_.BindNewPipeAndPassReceiver()); net::NetworkChangeNotifier::AddConnectionTypeObserver(this); net::NetworkChangeNotifier::AddMaxBandwidthObserver(this); net::NetworkChangeNotifier::AddIPAddressObserver(this); @@ -193,17 +197,6 @@ void NetworkServiceClient::OnDNSChanged() { network::mojom::ConnectionSubtype( net::NetworkChangeNotifier::GetConnectionSubtype())); } - -void NetworkServiceClient::OnInitialDNSConfigRead() { - network_change_manager_->OnNetworkChanged( - true /* dns_changed */, false /* ip_address_changed */, - false /* connection_type_changed */, - network::mojom::ConnectionType( - net::NetworkChangeNotifier::GetConnectionType()), - false /* connection_subtype_changed */, - network::mojom::ConnectionSubtype( - net::NetworkChangeNotifier::GetConnectionSubtype())); -} #endif void NetworkServiceClient::OnDataUseUpdate( |