Re-enable storage for Suborigins.

chrome/browser/browsing_data/cookies_tree_model.cc

Index: chrome/browser/browsing_data/cookies_tree_model.cc
diff --git a/chrome/browser/browsing_data/cookies_tree_model.cc b/chrome/browser/browsing_data/cookies_tree_model.cc
index 959624e12a0d987bad35f31d0e4275cfa89e3e80..eb0f93822ae9f8da9715b3a2f67c71da942480c0 100644
--- a/chrome/browser/browsing_data/cookies_tree_model.cc
+++ b/chrome/browser/browsing_data/cookies_tree_model.cc
@@ -21,6 +21,7 @@
 #include "chrome/browser/content_settings/cookie_settings_factory.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/content_settings/core/browser/cookie_settings.h"
+#include "content/public/common/origin_util.h"
 #include "content/public/common/url_constants.h"
 #include "grit/theme_resources.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
@@ -82,7 +83,7 @@ std::string CanonicalizeHost(const GURL& url) {
            url::kStandardSchemeSeparator;
   }
 
-  std::string host = url.host();
+  std::string host = content::HostFromUrlStripSuborigin(url);
   std::string retval =
       net::registry_controlled_domains::GetDomainAndRegistry(
           host,
@@ -631,8 +632,9 @@ CookieTreeNode::DetailedInfo CookieTreeRootNode::GetDetailedInfo() const {
 base::string16 CookieTreeHostNode::TitleForUrl(const GURL& url) {
   const std::string file_origin_node_name(
       std::string(url::kFileScheme) + url::kStandardSchemeSeparator);
-  return base::UTF8ToUTF16(url.SchemeIsFile() ? file_origin_node_name
-                                              : url.host());
+  return base::UTF8ToUTF16(url.SchemeIsFile()
+                               ? file_origin_node_name
+                               : content::HostFromUrlStripSuborigin(url));
 }
 
 CookieTreeHostNode::CookieTreeHostNode(const GURL& url)