BASELINE: Update Chromium to 85.0.4183.14085-based

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

1 files changed, 6 insertions, 13 deletions

diff --git a/chromium/net/dns/host_resolver.cc b/chromium/net/dns/host_resolver.cc
index 4d7dee3f90c..2fb635a7a28 100644
--- a/chromium/net/dns/host_resolver.cc
+++ b/chromium/net/dns/host_resolver.cc
@@ -8,6 +8,7 @@
 
 #include "base/bind.h"
 #include "base/check.h"
+#include "base/immediate_crash.h"
 #include "base/macros.h"
 #include "base/no_destructor.h"
 #include "base/notreached.h"
@@ -56,11 +57,6 @@ class FailingRequestImpl : public HostResolver::ResolveHostRequest,
     return *nullopt_result;
   }
 
-  const base::Optional<EsniContent>& GetEsniResults() const override {
-    static const base::NoDestructor<base::Optional<EsniContent>> nullopt_result;
-    return *nullopt_result;
-  }
-
   ResolveErrorInfo GetResolveErrorInfo() const override {
     return ResolveErrorInfo(error_);
   }
@@ -80,6 +76,11 @@ class FailingRequestImpl : public HostResolver::ResolveHostRequest,
 
 }  // namespace
 
+const base::Optional<std::vector<bool>>&
+HostResolver::ResolveHostRequest::GetIntegrityResultsForTesting() const {
+  IMMEDIATE_CRASH();
+}
+
 const size_t HostResolver::ManagerOptions::kDefaultRetryAttempts =
     static_cast<size_t>(-1);
 
@@ -107,14 +108,6 @@ HostResolver::ResolveHostParameters::ResolveHostParameters(
 
 HostResolver::~HostResolver() = default;
 
-std::unique_ptr<HostResolver::ResolveHostRequest> HostResolver::CreateRequest(
-    const HostPortPair& host,
-    const NetLogWithSource& net_log,
-    const base::Optional<ResolveHostParameters>& optional_parameters) {
-  return CreateRequest(host, NetworkIsolationKey(), net_log,
-                       optional_parameters);
-}
-
 std::unique_ptr<HostResolver::ProbeRequest>
 HostResolver::CreateDohProbeRequest() {
   // Should be overridden in any HostResolver implementation where this method