Re-enable storage for Suborigins.

content/common/origin_util.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 "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/stl_util.h"
 #include "content/public/common/content_client.h"
@@ skipping 72 matching lines @@
     return true;
   }
 
   return false;
 }
 
 void ResetSchemesAndOriginsWhitelistForTesting() {
   g_trustworthy_whitelist.Get().Reset();
 }
 
+bool HasSuborigin(const GURL& url) {
+  return url.host().find("_") != std::string::npos;

[nasko, 2016/09/26 18:26:13]

Huh, I thought we changed how we serialize suborigins. No?

[jww, 2016/09/26 21:18:57]

Indeed! I'm a moron. New patch should address this.

+}
+
+std::string SuboriginFromUrl(const GURL& url) {
+  if (!HasSuborigin(url))
+    return "";
+  size_t suborigin_end = url.host().find("_");
+  return url.host().substr(0, suborigin_end);
+}
+
+std::string HostFromUrlStripSuborigin(const GURL& url) {
+  std::string host = url.host();
+  size_t suborigin_end = host.find("_");
+  if (suborigin_end == std::string::npos)
+    return host;
+  return url.host().substr(suborigin_end + 1,
+                           host.length() - suborigin_end - 1);
+}
+
 }  // namespace content