Add support for split Public Suffix List distinctions.

chrome/browser/content_settings/local_shared_objects_container.cc

 // Copyright (c) 2012 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 "chrome/browser/content_settings/local_shared_objects_container.h"
 
 #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_database_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_file_system_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.h"
 #include "chrome/browser/browsing_data/cookies_tree_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "net/cookies/canonical_cookie.h"
 
+namespace {
+
+// Helper wrapper for net::registry_controlled_domains::SameDomainOrHost
+// which always excludes private registries.
+bool SamePublicDomainOrHost(const GURL& gurl1, const GURL& gurl2) {
+  return net::registry_controlled_domains::SameDomainOrHost(
+      gurl1,
+      gurl2,
+      net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
+}
+
+}
+
 LocalSharedObjectsContainer::LocalSharedObjectsContainer(Profile* profile)
     : appcaches_(new CannedBrowsingDataAppCacheHelper(profile)),
       cookies_(new CannedBrowsingDataCookieHelper(
           profile->GetRequestContext())),
       databases_(new CannedBrowsingDataDatabaseHelper(profile)),
       file_systems_(new CannedBrowsingDataFileSystemHelper(profile)),
       indexed_dbs_(new CannedBrowsingDataIndexedDBHelper()),
       local_storages_(new CannedBrowsingDataLocalStorageHelper(profile)),
       server_bound_certs_(new CannedBrowsingDataServerBoundCertHelper()),
       session_storages_(new CannedBrowsingDataLocalStorageHelper(profile)) {
@@ skipping 44 matching lines @@
       it != origin_cookies_list_map.end();
       ++it) {
     const net::CookieList* cookie_list = it->second;
     for (net::CookieList::const_iterator cookie = cookie_list->begin();
          cookie != cookie_list->end();
          ++cookie) {
       // Strip leading '.'s.
       std::string cookie_domain = cookie->Domain();
       if (cookie_domain[0] == '.')
         cookie_domain = cookie_domain.substr(1);
-      // The |domain_url| is only created in order to use the SameDomainOrHost
-      // method below. It does not matter which scheme is used as the scheme is
-      // ignored by the SameDomainOrHost method.
+      // The |domain_url| is only created in order to use the
+      // SamePublicDomainOrHost method below. It does not matter which scheme is
+      // used as the scheme is ignored by the SamePublicDomainOrHost method.
       GURL domain_url(std::string(chrome::kHttpScheme) +
                       content::kStandardSchemeSeparator + cookie_domain);
-      if (net::RegistryControlledDomainService::SameDomainOrHost(
-             origin, domain_url)) {
+      if (SamePublicDomainOrHost(origin, domain_url))
         ++count;
-      }
     }
   }
 
   // Count local storages for the domain of the given |origin|.
   const std::set<GURL> local_storage_info =
       local_storages()->GetLocalStorageInfo();
   for (std::set<GURL>::const_iterator it = local_storage_info.begin();
        it != local_storage_info.end();
        ++it) {
-    if (net::RegistryControlledDomainService::SameDomainOrHost(
-            origin, *it)) {
+    if (SamePublicDomainOrHost(origin, *it))
       ++count;
-    }
   }
 
   // Count session storages for the domain of the given |origin|.
   const std::set<GURL> urls = session_storages()->GetLocalStorageInfo();
   for (std::set<GURL>::const_iterator it = urls.begin();
        it != urls.end();
        ++it) {
-    if (net::RegistryControlledDomainService::SameDomainOrHost(
-            origin, *it)) {
+    if (SamePublicDomainOrHost(origin, *it))
       ++count;
-    }
   }
 
   // Count indexed dbs for the domain of the given |origin|.
   typedef CannedBrowsingDataIndexedDBHelper::PendingIndexedDBInfo IndexedDBInfo;
   const std::set<IndexedDBInfo>& indexed_db_info =
       indexed_dbs()->GetIndexedDBInfo();
   for (std::set<IndexedDBInfo>::const_iterator it =
           indexed_db_info.begin();
       it != indexed_db_info.end();
       ++it) {
-    if (net::RegistryControlledDomainService::SameDomainOrHost(
-            origin, it->origin)) {
+    if (SamePublicDomainOrHost(origin, it->origin))
       ++count;
-    }
   }
 
   // Count filesystems for the domain of the given |origin|.
   typedef BrowsingDataFileSystemHelper::FileSystemInfo FileSystemInfo;
   typedef std::list<FileSystemInfo> FileSystemInfoList;
   const FileSystemInfoList& file_system_info =
       file_systems()->GetFileSystemInfo();
   for (FileSystemInfoList::const_iterator it = file_system_info.begin();
        it != file_system_info.end();
        ++it) {
-    if (net::RegistryControlledDomainService::SameDomainOrHost(
-        origin, it->origin)) {
+    if (SamePublicDomainOrHost(origin, it->origin))
       ++count;
-    }
   }
 
   // Count databases for the domain of the given |origin|.
   typedef CannedBrowsingDataDatabaseHelper::PendingDatabaseInfo DatabaseInfo;
   const std::set<DatabaseInfo>& database_list =
       databases()->GetPendingDatabaseInfo();
   for (std::set<DatabaseInfo>::const_iterator it =
           database_list.begin();
       it != database_list.end();
       ++it) {
-    if (net::RegistryControlledDomainService::SameDomainOrHost(
-            origin, it->origin)) {
+    if (SamePublicDomainOrHost(origin, it->origin))
       ++count;
-    }
   }
 
   // Count the AppCache manifest files for the domain of the given |origin|.
   typedef BrowsingDataAppCacheHelper::OriginAppCacheInfoMap
       OriginAppCacheInfoMap;
   const OriginAppCacheInfoMap& map = appcaches()->GetOriginAppCacheInfoMap();
   for (OriginAppCacheInfoMap::const_iterator it = map.begin();
        it != map.end();
        ++it) {
     const appcache::AppCacheInfoVector& info_vector = it->second;
     for (appcache::AppCacheInfoVector::const_iterator info =
              info_vector.begin();
          info != info_vector.end();
          ++info) {
-       if (net::RegistryControlledDomainService::SameDomainOrHost(
-            origin, info->manifest_url)) {
+       if (SamePublicDomainOrHost(origin, info->manifest_url))
          ++count;
-       }
     }
   }
 
   return count;
 }
 
 scoped_ptr<CookiesTreeModel>
 LocalSharedObjectsContainer::CreateCookiesTreeModel() const {
   LocalDataContainer* container = new LocalDataContainer(
       cookies()->Clone(),
       databases()->Clone(),
       local_storages()->Clone(),
       session_storages()->Clone(),
       appcaches()->Clone(),
       indexed_dbs()->Clone(),
       file_systems()->Clone(),
       NULL,
       server_bound_certs()->Clone(),
       NULL);
 
   return make_scoped_ptr(new CookiesTreeModel(container, NULL, true));
 }