Revert "Reland "Squash top level error code returned from host resolver.""

This reverts commit c4f3b72d.

Reason for revert: Breaking network_service_out_of_process_chrome_public_test_apk, see http://crbug.com/1041822

Original change's description:
> Reland "Squash top level error code returned from host resolver."
> 
> This is a reland of 834f2092
> 
> Now not squashing ERR_NOT_IMPLEMENTED to avoid disrupting existing
> InProcessBrowserTests.
> 
> Original change's description:
> > Squash top level error code returned from host resolver.
> >
> > If the host resolution process fails, the top level error code should
> > now be only ERR_NAME_NOT_RESOLVED. A more specific error code (e.g.
> > ERR_CONNECTION_REFUSED if a secure mode DoH server was offline) may be
> > found in ResolveErrorInfo.
> >
> > Bug: 1016325
> > Change-Id: I9f5f857fffd71be6485d05280239cd0b649d7a8f
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1974678
> > Commit-Queue: Katharine Daly <dalyk@google.com>
> > Reviewed-by: Matt Menke <mmenke@chromium.org>
> > Reviewed-by: John Abd-El-Malek <jam@chromium.org>
> > Reviewed-by: Eric Orth <ericorth@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#728725}
> 
> Bug: 1016325
> Change-Id: If2d029ea94f1a85f95d641cf02e4283973316a98
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1992191
> Reviewed-by: Eric Orth <ericorth@chromium.org>
> Reviewed-by: Matt Menke <mmenke@chromium.org>
> Reviewed-by: John Abd-El-Malek <jam@chromium.org>
> Commit-Queue: Katharine Daly <dalyk@google.com>
> Cr-Commit-Position: refs/heads/master@{#730951}

TBR=jam@chromium.org,mmenke@chromium.org,ericorth@chromium.org,dalyk@google.com

Change-Id: I1d4d1c9b76c73a3762cfe739e5c99993579d1546
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1016325, 1041822
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2001439Reviewed-by: Clark DuVall <cduvall@chromium.org>
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#731695}

chrome/test/base/in_process_browser_test_browsertest.cc

@@ -21,7 +21,6 @@
 #include "content/public/common/content_switches.h"
 #include "net/base/filename_util.h"
 #include "net/base/net_errors.h"
-#include "net/dns/public/resolve_error_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
@@ -45,8 +44,7 @@ class LoadFailObserver : public content::WebContentsObserver {
   explicit LoadFailObserver(content::WebContents* contents)
       : content::WebContentsObserver(contents),
         failed_load_(false),
-        error_code_(net::OK),
-        resolve_error_info_(net::ResolveErrorInfo(net::OK)) {}
+        error_code_(net::OK) { }
 
   void DidFinishNavigation(
       content::NavigationHandle* navigation_handle) override {
@@ -55,21 +53,16 @@ class LoadFailObserver : public content::WebContentsObserver {
 
     failed_load_ = true;
     error_code_ = navigation_handle->GetNetErrorCode();
-    resolve_error_info_ = navigation_handle->GetResolveErrorInfo();
     validated_url_ = navigation_handle->GetURL();
   }
 
   bool failed_load() const { return failed_load_; }
   net::Error error_code() const { return error_code_; }
-  net::ResolveErrorInfo resolve_error_info() const {
-    return resolve_error_info_;
-  }
   const GURL& validated_url() const { return validated_url_; }
 
  private:
   bool failed_load_;
   net::Error error_code_;
-  net::ResolveErrorInfo resolve_error_info_;
   GURL validated_url_;
 
   DISALLOW_COPY_AND_ASSIGN(LoadFailObserver);
@@ -92,7 +85,6 @@ IN_PROC_BROWSER_TEST_F(InProcessBrowserTest, ExternalConnectionFail) {
     ui_test_utils::NavigateToURL(browser(), url);
     EXPECT_TRUE(observer.failed_load());
     EXPECT_EQ(net::ERR_NOT_IMPLEMENTED, observer.error_code());
-    EXPECT_EQ(net::ERR_NOT_IMPLEMENTED, observer.resolve_error_info().error);
     EXPECT_EQ(url, observer.validated_url());
   }
 }

chrome/test/ppapi/ppapi_browsertest.cc

@@ -1313,7 +1313,7 @@ void CheckTestHostNameUsedWithCorrectNetworkIsolationKey(Browser* browser) {
   network::DnsLookupResult result2 =
       network::BlockingDnsLookup(network_context, kHostPortPair,
                                  std::move(params), net::NetworkIsolationKey());
-  EXPECT_EQ(net::ERR_NAME_NOT_RESOLVED, result2.error);
+  EXPECT_EQ(net::ERR_DNS_CACHE_MISS, result2.error);
 }
 
 // HostResolver and HostResolverPrivate tests. The PPAPI code used by these

components/cronet/stale_host_resolver.cc

@@ -216,10 +216,8 @@ int StaleHostResolver::RequestImpl::Start(
   cache_parameters.source = net::HostResolverSource::LOCAL_ONLY;
   cache_request_ = resolver_->inner_resolver_->CreateRequest(
       host_, network_isolation_key_, net_log_, cache_parameters);
-  int error =
+  cache_error_ =
       cache_request_->Start(base::BindOnce([](int error) { NOTREACHED(); }));
-  DCHECK_NE(net::ERR_IO_PENDING, error);
-  cache_error_ = cache_request_->GetResolveErrorInfo().error;
   DCHECK_NE(net::ERR_IO_PENDING, cache_error_);
   // If it's a fresh cache hit (or literal), return it synchronously.
   if (cache_error_ != net::ERR_DNS_CACHE_MISS &&

content/browser/frame_host/navigation_request_browsertest.cc

@@ -1643,7 +1643,7 @@ IN_PROC_BROWSER_TEST_F(NavigationRequestHostResolutionFailureTest,
 
   EXPECT_TRUE(observer.has_committed());
   EXPECT_TRUE(observer.is_error());
-  EXPECT_EQ(net::ERR_NAME_NOT_RESOLVED, observer.net_error_code());
+  EXPECT_EQ(net::ERR_DNS_TIMED_OUT, observer.net_error_code());
   EXPECT_EQ(net::ERR_DNS_TIMED_OUT, observer.resolve_error_info().error);
 }
 

content/public/test/test_host_resolver.cc

@@ -45,8 +45,6 @@ class LocalHostResolverProc : public net::HostResolverProc {
     // queries, rather than perform them.
     // If you really need to make an external DNS query, use
     // net::RuleBasedHostResolverProc and its AllowDirectLookup method.
-    // TODO(crbug.com/1040686): Simulate failure using ERR_NAME_NOT_RESOLVED
-    // rather than ERR_NOT_IMPLEMENTED.
     if (!local) {
       DVLOG(1) << "To avoid external dependencies, simulating failure for "
                   "external DNS lookup of "

net/base/net_errors.cc

@@ -63,8 +63,8 @@ bool IsClientCertificateError(int error) {
 }
 
 bool IsDnsError(int error) {
-  DCHECK_NE(ERR_NAME_RESOLUTION_FAILED, error);
-  return error == ERR_NAME_NOT_RESOLVED;
+  return (error == ERR_NAME_NOT_RESOLVED ||
+          error == ERR_NAME_RESOLUTION_FAILED);
 }
 
 Error FileErrorToNetError(base::File::Error file_error) {

net/dns/host_resolver.cc

@@ -242,10 +242,7 @@ HostResolverFlags HostResolver::ParametersToHostResolverFlags(
 
 // static
 int HostResolver::SquashErrorCode(int error) {
-  // TODO(crbug.com/1040686): Once InProcessBrowserTests do not use
-  // ERR_NOT_IMPLEMENTED to simulate DNS failures, it should be ok to squash
-  // ERR_NOT_IMPLEMENTED.
-  if (error == OK || error == ERR_IO_PENDING || error == ERR_NOT_IMPLEMENTED ||
+  if (error == OK || error == ERR_IO_PENDING ||
       error == ERR_NAME_NOT_RESOLVED) {
     return error;
   } else {

net/dns/host_resolver.h

@@ -66,9 +66,12 @@ class NET_EXPORT HostResolver {
     // On any other returned value, the request was handled synchronously and
     // |callback| will not be invoked.
     //
-    // Results in ERR_NAME_NOT_RESOLVED if the hostname is not resolved. More
-    // detail about the underlying error can be retrieved using
-    // GetResolveErrorInfo().
+    // Results in ERR_NAME_NOT_RESOLVED if the hostname is invalid, or if it is
+    // an incompatible IP literal (e.g. IPv6 is disabled and it is an IPv6
+    // literal).
+    //
+    // Results in ERR_DNS_CACHE_MISS if only fast local sources are to be
+    // queried and a cache lookup attempt fails.
     //
     // The parent HostResolver must still be alive when Start() is called,  but
     // if it is destroyed before an asynchronous result completes, the request

net/dns/host_resolver_manager.cc

@@ -650,7 +650,7 @@ class HostResolverManager::RequestImpl
     LogFinishRequest(error);
 
     DCHECK(callback_);
-    std::move(callback_).Run(HostResolver::SquashErrorCode(error));
+    std::move(callback_).Run(error);
   }
 
   Job* job() const { return job_; }
@@ -3015,7 +3015,7 @@ int HostResolverManager::Resolve(RequestImpl* request) {
                     effective_secure_dns_mode, base::TimeDelta());
     request->set_error_info(results.error(),
                             false /* is_secure_network_error */);
-    return HostResolver::SquashErrorCode(results.error());
+    return results.error();
   }
 
   CreateAndStartJob(effective_query_type, effective_host_resolver_flags,

net/url_request/http_with_dns_over_https_unittest.cc

@@ -313,7 +313,7 @@ TEST_F(HttpWithDnsOverHttpsTest, EndToEndFail) {
   EXPECT_EQ(test_https_requests_served_, 0u);
 
   EXPECT_TRUE(d.response_completed());
-  EXPECT_EQ(d.request_status(), net::ERR_NAME_NOT_RESOLVED);
+  EXPECT_EQ(d.request_status(), net::ERR_DNS_MALFORMED_RESPONSE);
 
   const auto& resolve_error_info = req->response_info().resolve_error_info;
   EXPECT_TRUE(resolve_error_info.is_secure_network_error);