Adds default port handling to FormatUrl.

net/base/net_util_icu.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/base/net_util.h"
 
 #include <map>
 #include <vector>
 
 #include "base/i18n/time_formatting.h"
@@ skipping 558 matching lines @@
 }
 
 }  // namespace
 
 const FormatUrlType kFormatUrlOmitNothing                     = 0;
 const FormatUrlType kFormatUrlOmitUsernamePassword            = 1 << 0;
 const FormatUrlType kFormatUrlOmitHTTP                        = 1 << 1;
 const FormatUrlType kFormatUrlOmitTrailingSlashOnBareHostname = 1 << 2;
 const FormatUrlType kFormatUrlOmitAll = kFormatUrlOmitUsernamePassword |
     kFormatUrlOmitHTTP | kFormatUrlOmitTrailingSlashOnBareHostname;
+const FormatUrlType kFormatUrlOmitDefaultPort = 1 << 3;
 
 base::string16 IDNToUnicode(const std::string& host,
                             const std::string& languages) {
   return IDNToUnicodeWithAdjustments(host, languages, NULL);
 }
 
 std::string GetDirectoryListingEntry(const base::string16& name,
                                      const std::string& raw_bytes,
                                      bool is_dir,
                                      int64 size,
@@ skipping 153 matching lines @@
     if (parsed.username.is_valid() || parsed.password.is_valid())
       url_string.push_back('@');
   }
   if (prefix_end)
     *prefix_end = static_cast<size_t>(url_string.length());
 
   // Host.
   AppendFormattedComponent(spec, parsed.host, HostComponentTransform(languages),
                            &url_string, &new_parsed->host, adjustments);
 
-  // Port.
-  if (parsed.port.is_nonempty()) {
+  // Port.  Can omit port if it matches the default port for the scheme.
+  bool port_needs_reset = !parsed.port.is_nonempty();
+  if (!port_needs_reset && format_types & kFormatUrlOmitDefaultPort) {

[Ryan Sleevi, 2014/08/25 04:16:37]

Put this bitmask in ()

(format_type & kFormatUrlOmitDefaultPort)

+    int port = url::ParsePort(spec.data(), parsed.port);
+    // Intentionally keep the port if there is a parsing error.
+    port_needs_reset =
+        (port == url::PORT_UNSPECIFIED) ||
+        (port == url::DefaultPortForScheme(spec.data() + parsed.scheme.begin,
+                                           parsed.scheme.len));
+    if (port_needs_reset) {
+      adjustments->push_back(base::OffsetAdjuster::Adjustment(
+          parsed.port.begin, parsed.port.len, 0));
+    }
+  }
+
+  if (!port_needs_reset) {
     url_string.push_back(':');
     new_parsed->port.begin = url_string.length();
     url_string.insert(url_string.end(),
                       spec.begin() + parsed.port.begin,
                       spec.begin() + parsed.port.end());
     new_parsed->port.len = url_string.length() - new_parsed->port.begin;
   } else {
     new_parsed->port.reset();
   }
 
@@ skipping 57 matching lines @@
   if (offset_for_adjustment)
     offsets.push_back(*offset_for_adjustment);
   base::string16 result = FormatUrlWithOffsets(url, languages, format_types,
       unescape_rules, new_parsed, prefix_end, &offsets);
   if (offset_for_adjustment)
     *offset_for_adjustment = offsets[0];
   return result;
 }
 
 }  // namespace net