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

1 files changed, 1 insertions, 8 deletions

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);
     }