summaryrefslogtreecommitdiff
path: root/chromium/net/dns/context_host_resolver.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2022-09-29 16:16:15 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2022-11-09 10:04:06 +0000
commita95a7417ad456115a1ef2da4bb8320531c0821f1 (patch)
treeedcd59279e486d2fd4a8f88a7ed025bcf925c6e6 /chromium/net/dns/context_host_resolver.h
parent33fc33aa94d4add0878ec30dc818e34e1dd3cc2a (diff)
downloadqtwebengine-chromium-a95a7417ad456115a1ef2da4bb8320531c0821f1.tar.gz
BASELINE: Update Chromium to 106.0.5249.126
Change-Id: Ib0bb21c437a7d1686e21c33f2d329f2ac425b7ab Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/438936 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/net/dns/context_host_resolver.h')
-rw-r--r--chromium/net/dns/context_host_resolver.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/chromium/net/dns/context_host_resolver.h b/chromium/net/dns/context_host_resolver.h
index 40f52618729..7499d699f72 100644
--- a/chromium/net/dns/context_host_resolver.h
+++ b/chromium/net/dns/context_host_resolver.h
@@ -12,6 +12,7 @@
#include "base/memory/raw_ptr.h"
#include "base/sequence_checker.h"
#include "net/base/net_export.h"
+#include "net/base/network_handle.h"
#include "net/base/network_isolation_key.h"
#include "net/dns/host_resolver.h"
#include "net/log/net_log_with_source.h"
@@ -72,8 +73,7 @@ class NET_EXPORT ContextHostResolver : public HostResolver {
void SetRequestContext(URLRequestContext* request_context) override;
HostResolverManager* GetManagerForTesting() override;
const URLRequestContext* GetContextForTesting() const override;
- NetworkChangeNotifier::NetworkHandle GetTargetNetworkForTesting()
- const override;
+ handles::NetworkHandle GetTargetNetworkForTesting() const override;
// Returns the number of host cache entries that were restored, or 0 if there
// is no cache.
@@ -88,8 +88,10 @@ class NET_EXPORT ContextHostResolver : public HostResolver {
}
private:
- const raw_ptr<HostResolverManager> manager_;
std::unique_ptr<HostResolverManager> owned_manager_;
+ // `manager_` might point to `owned_manager_`. It must be declared last and
+ // cleared first.
+ const raw_ptr<HostResolverManager> manager_;
std::unique_ptr<ResolveContext> resolve_context_;
// If true, the context is shutting down. Subsequent request Start() calls