Add suborigin logic to url::Origin

url/url_canon_unittest.cc

Index: url/url_canon_unittest.cc
diff --git a/url/url_canon_unittest.cc b/url/url_canon_unittest.cc
index dfb3dfe1c4dd63ac05fab67cfac244bfcfc0e952..ef11e2242bafd47ec8c219e97206779e57830686 100644
--- a/url/url_canon_unittest.cc
+++ b/url/url_canon_unittest.cc
@@ -2173,4 +2173,36 @@ TEST(URLCanonTest, ReplacementOverflow) {
   EXPECT_TRUE(expected == repl_str);
 }
 
+TEST(URLCanonTest, DefaultPortForScheme) {

[nasko, 2016/10/13 22:16:45]

Hmm, this test case doesn't belong logically with change for suborigins. I'd
personally commit it in a separate CL.

[jww, 2016/10/14 01:08:58]

How so? I added Suborigins to DefaultPortForScheme in this CL (and it is a
necessary addition for serialization), and Mike pointed out that I ought to unit
test that change. Unfortunately, there wasn't already a unit test for
DefaultPortForScheme, so it felt natural to add the other schemes while adding
the unit test for suborigins.

[nasko, 2016/10/14 14:12:41]

It is totally fine if you want to commit it this way, I just missed the "nit:"
prefix in my comment. I was just stating personal preference on committing
chunks of code.

+  struct TestCases {
+    const std::string scheme;
+    const int expected_port;
+  } cases[]{
+      {"http", 80},
+      {"https", 443},
+      {"ftp", 21},
+      {"ws", 80},
+      {"wss", 443},
+      {"gopher", 70},
+      {"http-so", 80},
+      {"https-so", 443},
+      {"fake-scheme", PORT_UNSPECIFIED},
+      {"HTTP", PORT_UNSPECIFIED},
+      {"HTTPS", PORT_UNSPECIFIED},
+      {"FTP", PORT_UNSPECIFIED},
+      {"WS", PORT_UNSPECIFIED},
+      {"WSS", PORT_UNSPECIFIED},
+      {"GOPHER", PORT_UNSPECIFIED},
+      {"HTTP-SO", PORT_UNSPECIFIED},
+      {"HTTPS-SO", PORT_UNSPECIFIED},
+  };
+
+  for (auto& test_case : cases) {
+    SCOPED_TRACE(test_case.scheme);
+    EXPECT_EQ(test_case.expected_port,
+              DefaultPortForScheme(test_case.scheme.c_str(),
+                                   test_case.scheme.size()));
+  }
+}
+
 }  // namespace url