Revert 43826 - HostResolver now adds AI_CANONNAME to the hint flags if a requester needs the information.

Requests which want the canonical name should be treated differently from requests that do not for the same host in both the HostCache as well as in the HostResolver when combining multiple outstanding requests into a job.

The motivation for this is that Kerberos SPN's for a web server are typically generated using the canonical name of the server rather than a DNS alias (both Firefox and IE have this behavior).

BUG=29862
TEST=net_unittests

Review URL: http://codereview.chromium.org/1566012

TBR=cbentzel@chromium.org
Review URL: http://codereview.chromium.org/1629005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43833 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 3 insertions, 14 deletions

diff --git a/chrome/browser/intranet_redirect_detector.cc b/chrome/browser/intranet_redirect_detector.cc
index 8466cd7..3a527f6 100644
--- a/chrome/browser/intranet_redirect_detector.cc
+++ b/chrome/browser/intranet_redirect_detector.cc
@@ -158,7 +158,6 @@ IntranetRedirectHostResolverProc::IntranetRedirectHostResolverProc(
 
 int IntranetRedirectHostResolverProc::Resolve(const std::string& host,
                                               net::AddressFamily address_family,
-                                              net::HostResolverFlags flags,
                                               net::AddressList* addrlist) {
   // We'd love to just ask the IntranetRedirectDetector, but we may not be on
   // the same thread.  So just use the heuristic that any all-lowercase a-z
@@ -168,5 +167,5 @@ int IntranetRedirectHostResolverProc::Resolve(const std::string& host,
       (host.find_first_not_of("abcdefghijklmnopqrstuvwxyz") ==
           std::string::npos)) ?
       net::ERR_NAME_NOT_RESOLVED :
-      ResolveUsingPrevious(host, address_family, flags, addrlist);
+      ResolveUsingPrevious(host, address_family, addrlist);
 }
diff --git a/chrome/browser/intranet_redirect_detector.h b/chrome/browser/intranet_redirect_detector.h
index b8c5dca..f1e38ae 100644
--- a/chrome/browser/intranet_redirect_detector.h
+++ b/chrome/browser/intranet_redirect_detector.h
@@ -100,7 +100,6 @@ class IntranetRedirectHostResolverProc : public net::HostResolverProc {
 
   virtual int Resolve(const std::string& host,
                       net::AddressFamily address_family,
-                      net::HostResolverFlags host_resolver_flags,
                       net::AddressList* addrlist);
 };
 
diff --git a/chrome/browser/net/view_net_internals_job_factory.cc b/chrome/browser/net/view_net_internals_job_factory.cc
index b957aca..aa39f1f 100644
--- a/chrome/browser/net/view_net_internals_job_factory.cc
+++ b/chrome/browser/net/view_net_internals_job_factory.cc
@@ -349,7 +349,6 @@ class HostResolverCacheSubSection : public SubSection {
                 "<th>Host</th>"
                 "<th>Address family</th>"
                 "<th>Address list</th>"
-                "<th>Canonical name</th>"
                 "<th>Time to live (ms)</th>"
                 "</tr>");
 
@@ -378,7 +377,6 @@ class HostResolverCacheSubSection : public SubSection {
       // Stringify all of the addresses in the address list, separated
       // by newlines (br).
       std::string address_list_html;
-      std::string canonical_name_html;
 
       if (entry->error != net::OK) {
         address_list_html = "<span style='font-weight: bold; color:red'>" +
@@ -393,19 +391,14 @@ class HostResolverCacheSubSection : public SubSection {
               net::NetAddressToString(current_address));
           current_address = current_address->ai_next;
         }
-        std::string canonical_name;
-        if (entry->addrlist.GetCanonicalName(&canonical_name)) {
-          canonical_name_html = EscapeForHTML(canonical_name);
-        }
       }
 
       StringAppendF(out,
                     "<td>%s</td><td>%s</td><td>%s</td>"
-                    "<td>%s</td><td>%d</td></tr>",
+                    "<td>%d</td></tr>",
                     EscapeForHTML(key.hostname).c_str(),
                     EscapeForHTML(address_family_str).c_str(),
                     address_list_html.c_str(),
-                    canonical_name_html.c_str(),
                     ttl_ms);
     }
 
diff --git a/chrome/test/unit/chrome_test_suite.h b/chrome/test/unit/chrome_test_suite.h
index 3529801..9532579 100644
--- a/chrome/test/unit/chrome_test_suite.h
+++ b/chrome/test/unit/chrome_test_suite.h
@@ -59,7 +59,6 @@ class WarningHostResolverProc : public net::HostResolverProc {
 
   virtual int Resolve(const std::string& host,
                       net::AddressFamily address_family,
-                      net::HostResolverFlags host_resolver_flags,
                       net::AddressList* addrlist) {
     const char* kLocalHostNames[] = {"localhost", "127.0.0.1"};
     bool local = false;
@@ -79,8 +78,7 @@ class WarningHostResolverProc : public net::HostResolverProc {
     // net::RuleBasedHostResolverProc and its AllowDirectLookup method.
     EXPECT_TRUE(local) << "Making external DNS lookup of " << host;
 
-    return ResolveUsingPrevious(host, address_family, host_resolver_flags,
-                                addrlist);
+    return ResolveUsingPrevious(host, address_family, addrlist);
   }
 };