Adds default port handling to FormatUrl.

net/base/net_util_icu_unittest.cc

 // Copyright 2014 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 <string.h>
 
 #include <vector>
 
@@ skipping 623 matching lines @@
     {"omit http with https",
      "https://www.google.com/", "en", kFormatUrlOmitHTTP,
      UnescapeRule::NORMAL, L"https://www.google.com/",
      8},
 
     {"omit http starts with ftp.",
      "http://ftp.google.com/", "en", kFormatUrlOmitHTTP,
      UnescapeRule::NORMAL, L"http://ftp.google.com/",
      7},
 
+    // -------- omit default port --------
+    {"handle no port to begin with",
+     "http://www.google.com/", "en",
+     kFormatUrlOmitDefaultPort, UnescapeRule::NORMAL,
+     L"http://www.google.com/", 7},
+    {"omit default port for http -> 80",
+     "http://www.google.com:80/", "en",
+     kFormatUrlOmitDefaultPort, UnescapeRule::NORMAL,
+     L"http://www.google.com/", 7},
+    {"leave port for http -> 81",
+     "http://www.google.com:81/", "en",
+     kFormatUrlOmitDefaultPort, UnescapeRule::NORMAL,
+     L"http://www.google.com:81/", 7},
+    {"omit port for https -> 443",
+     "https://www.google.com:443/", "en",
+     kFormatUrlOmitDefaultPort, UnescapeRule::NORMAL,
+     L"https://www.google.com/", 8},
+    {"leave port for https -> 80",
+     "https://www.google.com:80/", "en",
+     kFormatUrlOmitDefaultPort, UnescapeRule::NORMAL,
+     L"https://www.google.com:80/", 8},
+    {"omit port for ftp -> 21",
+     "ftp://www.google.com:21/", "en",
+     kFormatUrlOmitDefaultPort, UnescapeRule::NORMAL,
+     L"ftp://www.google.com/", 6},
+    {"leave port for ftp -> 40",
+     "ftp://www.google.com:40/", "en",
+     kFormatUrlOmitDefaultPort, UnescapeRule::NORMAL,
+     L"ftp://www.google.com:40/", 6},
+
     // -------- omit trailing slash on bare hostname --------
     {"omit slash when it's the entire path",
      "http://www.google.com/", "en",
      kFormatUrlOmitTrailingSlashOnBareHostname, UnescapeRule::NORMAL,
      L"http://www.google.com", 7},
     {"omit slash when there's a ref",
      "http://www.google.com/#ref", "en",
      kFormatUrlOmitTrailingSlashOnBareHostname, UnescapeRule::NORMAL,
      L"http://www.google.com/#ref", 7},
     {"omit slash when there's a query",
@@ skipping 408 matching lines @@
 
   const size_t omit_all_offsets[] = {
     0, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, 0, kNpos, kNpos, kNpos, kNpos,
     0, 1, 2, 3, 4, 5, 6, 7
   };
   CheckAdjustedOffsets("http://user@foo.com/", "en", kFormatUrlOmitAll,
                        UnescapeRule::NORMAL, omit_all_offsets);
 }
 
 }  // namespace net