Re-enable storage for Suborigins.

content/common/origin_util_unittest.cc

 // Copyright 2015 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 "content/public/common/origin_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 namespace content {
 
@@ skipping 29 matching lines @@
 
   EXPECT_FALSE(
       IsOriginSecure(GURL("filesystem:http://www.example.com/temporary/")));
   EXPECT_FALSE(
       IsOriginSecure(GURL("filesystem:ftp://www.example.com/temporary/")));
   EXPECT_TRUE(IsOriginSecure(GURL("filesystem:ftp://127.0.0.1/temporary/")));
   EXPECT_TRUE(
       IsOriginSecure(GURL("filesystem:https://www.example.com/temporary/")));
 }
 
+TEST(OriginUtilTest, Suborigins) {
+  GURL no_suborigin_simple_url("https://b");
+  GURL suborigin_simple_url("https-so://a.b");
+  GURL no_suborigin_bigger_url("https://example.com/some/path");
+  GURL suborigin_bigger_url("https-so://foobar.example.com/some/path");

[nasko, 2016/09/29 16:49:56]

Why not throw in all the parts of an URL to ensure we don't drop them? Port,
query string, fragment :).

[jww, 2016/09/29 22:21:00]

Done.

+
+  EXPECT_FALSE(HasSuborigin(no_suborigin_simple_url));
+  EXPECT_FALSE(HasSuborigin(no_suborigin_bigger_url));
+  EXPECT_TRUE(HasSuborigin(suborigin_simple_url));
+  EXPECT_TRUE(HasSuborigin(suborigin_bigger_url));
+
+  EXPECT_EQ("", SuboriginFromUrl(no_suborigin_simple_url));
+  EXPECT_EQ("", SuboriginFromUrl(no_suborigin_bigger_url));
+  EXPECT_EQ("a", SuboriginFromUrl(suborigin_simple_url));
+  EXPECT_EQ("foobar", SuboriginFromUrl(suborigin_bigger_url));
+
+  EXPECT_EQ(no_suborigin_simple_url,
+            StripSuboriginFromUrl(no_suborigin_simple_url));
+  EXPECT_EQ(no_suborigin_bigger_url,
+            StripSuboriginFromUrl(no_suborigin_bigger_url));
+  EXPECT_EQ(no_suborigin_simple_url,
+            StripSuboriginFromUrl(suborigin_simple_url));
+  EXPECT_EQ(no_suborigin_bigger_url,
+            StripSuboriginFromUrl(suborigin_bigger_url));
+
+  GURL just_dot_url("https-so://.");
+  GURL empty_hostname_url("https-so://");
+  GURL empty_suborigin_url("https-so://.foo");
+  GURL suborigin_but_empty_host_url("https-so://foo.");

[nasko, 2016/09/29 16:49:56]

What about testing StripSuboriginFromUrl and SuboriginFromUrl for those URLs?

[jww, 2016/09/29 22:21:00]

Done.

+  EXPECT_FALSE(HasSuborigin(just_dot_url));
+  EXPECT_FALSE(HasSuborigin(empty_hostname_url));
+  EXPECT_FALSE(HasSuborigin(empty_suborigin_url));
+  EXPECT_FALSE(HasSuborigin(suborigin_but_empty_host_url));
+}
+
 }  // namespace content