Add support for split PSL list distinctions.

chrome/browser/content_settings/local_shared_objects_container.cc

Index: chrome/browser/content_settings/local_shared_objects_container.cc
diff --git a/chrome/browser/content_settings/local_shared_objects_container.cc b/chrome/browser/content_settings/local_shared_objects_container.cc
index 2ec10fedccd656342f0090d0da7008d9f025aa5b..49da24f083a779acf6e496ca1c5bdb4e269d8593 100644
--- a/chrome/browser/content_settings/local_shared_objects_container.cc
+++ b/chrome/browser/content_settings/local_shared_objects_container.cc
@@ -87,8 +87,10 @@ size_t LocalSharedObjectsContainer::GetObjectCountForDomain(
       // ignored by the SameDomainOrHost method.
       GURL domain_url(std::string(chrome::kHttpScheme) +
                       content::kStandardSchemeSeparator + cookie_domain);
-      if (net::RegistryControlledDomainService::SameDomainOrHost(
-             origin, domain_url)) {
+      if (net::registry_controlled_domains::SameDomainOrHost(
+          origin,
+          domain_url,
+          net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES)) {
         ++count;
       }
     }
@@ -100,8 +102,10 @@ size_t LocalSharedObjectsContainer::GetObjectCountForDomain(
   for (std::set<GURL>::const_iterator it = local_storage_info.begin();
        it != local_storage_info.end();
        ++it) {
-    if (net::RegistryControlledDomainService::SameDomainOrHost(
-            origin, *it)) {
+    if (net::registry_controlled_domains::SameDomainOrHost(
+        origin,
+        *it,
+        net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES)) {
       ++count;
     }
   }
@@ -111,8 +115,10 @@ size_t LocalSharedObjectsContainer::GetObjectCountForDomain(
   for (std::set<GURL>::const_iterator it = urls.begin();
        it != urls.end();
        ++it) {
-    if (net::RegistryControlledDomainService::SameDomainOrHost(
-            origin, *it)) {
+    if (net::registry_controlled_domains::SameDomainOrHost(
+        origin,
+        *it,
+        net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES)) {
       ++count;
     }
   }
@@ -125,8 +131,10 @@ size_t LocalSharedObjectsContainer::GetObjectCountForDomain(
           indexed_db_info.begin();
       it != indexed_db_info.end();
       ++it) {
-    if (net::RegistryControlledDomainService::SameDomainOrHost(
-            origin, it->origin)) {
+    if (net::registry_controlled_domains::SameDomainOrHost(
+        origin,
+        it->origin,
+        net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES)) {
       ++count;
     }
   }
@@ -139,8 +147,10 @@ size_t LocalSharedObjectsContainer::GetObjectCountForDomain(
   for (FileSystemInfoList::const_iterator it = file_system_info.begin();
        it != file_system_info.end();
        ++it) {
-    if (net::RegistryControlledDomainService::SameDomainOrHost(
-        origin, it->origin)) {
+    if (net::registry_controlled_domains::SameDomainOrHost(
+        origin,
+        it->origin,
+        net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES)) {
       ++count;
     }
   }
@@ -153,8 +163,10 @@ size_t LocalSharedObjectsContainer::GetObjectCountForDomain(
           database_list.begin();
       it != database_list.end();
       ++it) {
-    if (net::RegistryControlledDomainService::SameDomainOrHost(
-            origin, it->origin)) {
+    if (net::registry_controlled_domains::SameDomainOrHost(
+        origin,
+        it->origin,
+        net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES)) {
       ++count;
     }
   }
@@ -171,8 +183,10 @@ size_t LocalSharedObjectsContainer::GetObjectCountForDomain(
              info_vector.begin();
          info != info_vector.end();
          ++info) {
-       if (net::RegistryControlledDomainService::SameDomainOrHost(
-            origin, info->manifest_url)) {
+       if (net::registry_controlled_domains::SameDomainOrHost(
+           origin,
+           info->manifest_url,
+           net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES)) {
          ++count;
        }
     }