Index: chrome/browser/browsing_data/browsing_data_remover.cc |
diff --git a/chrome/browser/browsing_data/browsing_data_remover.cc b/chrome/browser/browsing_data/browsing_data_remover.cc |
index a07aab0a7ce4ed22f037201f6543f544b182d0e4..8ecf4c543462b49dbcdf87fd5e3105b156d3015e 100644 |
--- a/chrome/browser/browsing_data/browsing_data_remover.cc |
+++ b/chrome/browser/browsing_data/browsing_data_remover.cc |
@@ -45,6 +45,8 @@ |
#include "components/autofill/core/browser/webdata/autofill_webdata_service.h" |
#include "components/browsing_data/storage_partition_http_cache_data_remover.h" |
#include "components/content_settings/core/browser/host_content_settings_map.h" |
+#include "components/content_settings/core/common/content_settings.h" |
+#include "components/content_settings/core/common/content_settings_pattern.h" |
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.h" |
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_service.h" |
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h" |
@@ -157,12 +159,21 @@ base::Callback<void(T)> IgnoreArgument(const base::Closure& callback) { |
} |
// Helper to create callback for BrowsingDataRemover::DoesOriginMatchMask. |
-bool DoesOriginMatchMask( |
+bool DoesOriginMatchMaskAndUrls( |
int origin_type_mask, |
+ const base::Callback<bool(const GURL&)>& predicate, |
const GURL& origin, |
storage::SpecialStoragePolicy* special_storage_policy) { |
- return BrowsingDataHelper::DoesOriginMatchMask( |
- origin, origin_type_mask, special_storage_policy); |
+ return predicate.Run(origin) && |
+ BrowsingDataHelper::DoesOriginMatchMask(origin, origin_type_mask, |
+ special_storage_policy); |
+} |
+ |
+bool ForwardPrimaryPatternCallback( |
+ const base::Callback<bool(const ContentSettingsPattern&)> predicate, |
+ const ContentSettingsPattern& primary_pattern, |
+ const ContentSettingsPattern& secondary_pattern) { |
+ return predicate.Run(primary_pattern); |
} |
void ClearHostnameResolutionCacheOnIOThread(IOThread* io_thread) { |
@@ -207,6 +218,19 @@ void ClearCookiesOnIOThread(base::Time delete_begin, |
IgnoreArgument<int>(callback)); |
} |
+void ClearCookiesWithPredicateOnIOThread( |
+ base::Time delete_begin, |
+ base::Time delete_end, |
+ net::CookieStore::CookiePredicate predicate, |
+ net::URLRequestContextGetter* rq_context, |
+ const base::Closure& callback) { |
+ DCHECK_CURRENTLY_ON(BrowserThread::IO); |
+ net::CookieStore* cookie_store = |
+ rq_context->GetURLRequestContext()->cookie_store(); |
+ cookie_store->DeleteAllCreatedBetweenWithPredicateAsync( |
+ delete_begin, delete_end, predicate, IgnoreArgument<int>(callback)); |
+} |
+ |
void OnClearedChannelIDsOnIOThread(net::URLRequestContextGetter* rq_context, |
const base::Closure& callback) { |
DCHECK_CURRENTLY_ON(BrowserThread::IO); |
@@ -327,12 +351,21 @@ void BrowsingDataRemover::SetRemoving(bool is_removing) { |
void BrowsingDataRemover::Remove(const TimeRange& time_range, |
int remove_mask, |
int origin_type_mask) { |
- RemoveImpl(time_range, remove_mask, GURL(), origin_type_mask); |
+ OriginFilterBuilder builder(OriginFilterBuilder::BLACKLIST); |
+ RemoveImpl(time_range, remove_mask, builder, origin_type_mask); |
+} |
+ |
+void BrowsingDataRemover::RemoveWithFilter( |
+ const TimeRange& time_range, |
+ int remove_mask, |
+ int origin_type_mask, |
+ const OriginFilterBuilder& origin_filter) { |
+ RemoveImpl(time_range, remove_mask, origin_filter, origin_type_mask); |
} |
void BrowsingDataRemover::RemoveImpl(const TimeRange& time_range, |
int remove_mask, |
- const GURL& remove_url, |
+ const OriginFilterBuilder& origin_filter, |
int origin_type_mask) { |
DCHECK_CURRENTLY_ON(BrowserThread::UI); |
@@ -346,18 +379,10 @@ void BrowsingDataRemover::RemoveImpl(const TimeRange& time_range, |
remove_mask_ = remove_mask; |
origin_type_mask_ = origin_type_mask; |
- // TODO(msramek): Replace |remove_origin| with |filter| in all backends. |
- const url::Origin remove_origin(remove_url); |
- OriginFilterBuilder builder(OriginFilterBuilder::BLACKLIST); |
- if (!remove_url.is_empty()) { |
- // Make sure that only URLs representing origins, with no extra components, |
- // are passed to this class. |
- DCHECK_EQ(remove_url, remove_url.GetOrigin()); |
- builder.SetMode(OriginFilterBuilder::WHITELIST); |
- builder.AddOrigin(url::Origin(remove_origin)); |
- } |
base::Callback<bool(const GURL& url)> same_origin_filter = |
- builder.BuildSameOriginFilter(); |
+ origin_filter.BuildSameOriginFilter(); |
+ base::Callback<bool(const ContentSettingsPattern& url)> same_pattern_filter = |
+ origin_filter.BuildWebsiteSettingsPatternMatchesFilter(); |
PrefService* prefs = profile_->GetPrefs(); |
bool may_delete_history = prefs->GetBoolean( |
@@ -393,20 +418,11 @@ void BrowsingDataRemover::RemoveImpl(const TimeRange& time_range, |
HistoryServiceFactory::GetForProfile( |
profile_, ServiceAccessType::EXPLICIT_ACCESS); |
if (history_service) { |
- // Selective history deletion is currently done through HistoryUI -> |
- // HistoryBackend -> HistoryService, and that is for individual URLs, |
- // not origins. The code below is currently unused, as the only callsite |
- // supplying |remove_url| is the unittest. |
- // TODO(msramek): Make it possible to delete history per origin, not just |
- // per URL, and use that functionality here. |
- std::set<GURL> restrict_urls; |
- if (!remove_url.is_empty()) |
- restrict_urls.insert(remove_url); |
+ // TODO(dmurph): Support all backends with filter (crbug.com/113621). |
content::RecordAction(UserMetricsAction("ClearBrowsingData_History")); |
waiting_for_clear_history_ = true; |
- |
history_service->ExpireLocalAndRemoteHistoryBetween( |
- WebHistoryServiceFactory::GetForProfile(profile_), restrict_urls, |
+ WebHistoryServiceFactory::GetForProfile(profile_), std::set<GURL>(), |
delete_begin_, delete_end_, |
base::Bind(&BrowsingDataRemover::OnHistoryDeletionDone, |
weak_ptr_factory_.GetWeakPtr()), |
@@ -416,7 +432,8 @@ void BrowsingDataRemover::RemoveImpl(const TimeRange& time_range, |
// The extension activity contains details of which websites extensions |
// were active on. It therefore indirectly stores details of websites a |
// user has visited so best clean from here as well. |
- extensions::ActivityLog::GetInstance(profile_)->RemoveURLs(restrict_urls); |
+ extensions::ActivityLog::GetInstance(profile_)->RemoveURLs( |
+ std::set<GURL>()); |
#endif |
} |
@@ -429,6 +446,7 @@ void BrowsingDataRemover::RemoveImpl(const TimeRange& time_range, |
// The power consumption history by origin contains details of websites |
// that were visited. |
+ // TODO(dmurph): Support all backends with filter (crbug.com/113621). |
power::OriginPowerMap* origin_power_map = |
power::OriginPowerMapFactory::GetForBrowserContext(profile_); |
if (origin_power_map) |
@@ -438,6 +456,7 @@ void BrowsingDataRemover::RemoveImpl(const TimeRange& time_range, |
// reveals some history: we have no mechanism to track when these items were |
// created, so we'll clear them all. Better safe than sorry. |
if (g_browser_process->io_thread()) { |
+ // TODO(dmurph): Support all backends with filter (crbug.com/113621). |
waiting_for_clear_hostname_resolution_cache_ = true; |
BrowserThread::PostTaskAndReply( |
BrowserThread::IO, FROM_HERE, |
@@ -447,6 +466,7 @@ void BrowsingDataRemover::RemoveImpl(const TimeRange& time_range, |
weak_ptr_factory_.GetWeakPtr())); |
} |
if (profile_->GetNetworkPredictor()) { |
+ // TODO(dmurph): Support all backends with filter (crbug.com/113621). |
waiting_for_clear_network_predictor_ = true; |
BrowserThread::PostTaskAndReply( |
BrowserThread::IO, FROM_HERE, |
@@ -459,6 +479,7 @@ void BrowsingDataRemover::RemoveImpl(const TimeRange& time_range, |
// As part of history deletion we also delete the auto-generated keywords. |
TemplateURLService* keywords_model = |
TemplateURLServiceFactory::GetForProfile(profile_); |
+ |
if (keywords_model && !keywords_model->loaded()) { |
template_url_sub_ = keywords_model->RegisterOnLoadedCallback( |
base::Bind(&BrowsingDataRemover::OnKeywordsLoaded, |
@@ -466,8 +487,8 @@ void BrowsingDataRemover::RemoveImpl(const TimeRange& time_range, |
keywords_model->Load(); |
waiting_for_clear_keyword_data_ = true; |
} else if (keywords_model) { |
- keywords_model->RemoveAutoGeneratedForOriginBetween( |
- remove_url, delete_begin_, delete_end_); |
+ keywords_model->RemoveAutoGeneratedForOriginBetween(GURL(), delete_begin_, |
+ delete_end_); |
} |
// The PrerenderManager keeps history of prerendered pages, so clear that. |
@@ -477,6 +498,7 @@ void BrowsingDataRemover::RemoveImpl(const TimeRange& time_range, |
prerender::PrerenderManager* prerender_manager = |
prerender::PrerenderManagerFactory::GetForProfile(profile_); |
if (prerender_manager) { |
+ // TODO(dmurph): Support all backends with filter (crbug.com/113621). |
prerender_manager->ClearData( |
prerender::PrerenderManager::CLEAR_PRERENDER_CONTENTS | |
prerender::PrerenderManager::CLEAR_PRERENDER_HISTORY); |
@@ -484,7 +506,7 @@ void BrowsingDataRemover::RemoveImpl(const TimeRange& time_range, |
// If the caller is removing history for all hosts, then clear ancillary |
// historical information. |
- if (remove_url.is_empty()) { |
+ if (origin_filter.IsEmptyBlacklist()) { |
// We also delete the list of recently closed tabs. Since these expire, |
// they can't be more than a day old, so we can simply clear them all. |
sessions::TabRestoreService* tab_service = |
@@ -506,6 +528,7 @@ void BrowsingDataRemover::RemoveImpl(const TimeRange& time_range, |
// The saved Autofill profiles and credit cards can include the origin from |
// which these profiles and credit cards were learned. These are a form of |
// history, so clear them as well. |
+ // TODO(dmurph): Support all backends with filter (crbug.com/113621). |
scoped_refptr<autofill::AutofillWebDataService> web_data_service = |
WebDataServiceFactory::GetAutofillWebDataForProfile( |
profile_, ServiceAccessType::EXPLICIT_ACCESS); |
@@ -611,13 +634,25 @@ void BrowsingDataRemover::RemoveImpl(const TimeRange& time_range, |
scoped_refptr<net::URLRequestContextGetter> sb_context = |
sb_service->url_request_context(); |
++waiting_for_clear_cookies_count_; |
- BrowserThread::PostTask( |
- BrowserThread::IO, FROM_HERE, |
- base::Bind(&ClearCookiesOnIOThread, delete_begin_, delete_end_, |
- std::move(sb_context), |
- UIThreadTrampoline( |
- base::Bind(&BrowsingDataRemover::OnClearedCookies, |
- weak_ptr_factory_.GetWeakPtr())))); |
+ |
+ if (origin_filter.IsEmptyBlacklist()) { |
+ BrowserThread::PostTask( |
+ BrowserThread::IO, FROM_HERE, |
+ base::Bind(&ClearCookiesOnIOThread, delete_begin_, delete_end_, |
+ std::move(sb_context), |
+ UIThreadTrampoline( |
+ base::Bind(&BrowsingDataRemover::OnClearedCookies, |
+ weak_ptr_factory_.GetWeakPtr())))); |
+ } else { |
+ BrowserThread::PostTask( |
+ BrowserThread::IO, FROM_HERE, |
+ base::Bind(&ClearCookiesWithPredicateOnIOThread, delete_begin_, |
+ delete_end_, origin_filter.BuildDomainCookieFilter(), |
+ std::move(sb_context), |
+ UIThreadTrampoline( |
+ base::Bind(&BrowsingDataRemover::OnClearedCookies, |
+ weak_ptr_factory_.GetWeakPtr())))); |
+ } |
} |
} |
@@ -695,13 +730,17 @@ void BrowsingDataRemover::RemoveImpl(const TimeRange& time_range, |
#endif |
if (remove_mask & REMOVE_SITE_USAGE_DATA) { |
- HostContentSettingsMapFactory::GetForProfile(profile_) |
- ->ClearSettingsForOneType(CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT); |
+ ClearSettingsForOneTypeWithPredicate( |
+ HostContentSettingsMapFactory::GetForProfile(profile_), |
+ CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT, |
+ base::Bind(&ForwardPrimaryPatternCallback, same_pattern_filter)); |
} |
if (remove_mask & REMOVE_SITE_USAGE_DATA || remove_mask & REMOVE_HISTORY) { |
- HostContentSettingsMapFactory::GetForProfile(profile_) |
- ->ClearSettingsForOneType(CONTENT_SETTINGS_TYPE_APP_BANNER); |
+ ClearSettingsForOneTypeWithPredicate( |
+ HostContentSettingsMapFactory::GetForProfile(profile_), |
+ CONTENT_SETTINGS_TYPE_APP_BANNER, |
+ base::Bind(&ForwardPrimaryPatternCallback, same_pattern_filter)); |
} |
if (remove_mask & REMOVE_PASSWORDS) { |
@@ -749,6 +788,7 @@ void BrowsingDataRemover::RemoveImpl(const TimeRange& time_range, |
} |
} |
+ // TODO(dmurph): Support all backends with filter (crbug.com/113621). |
if (remove_mask & REMOVE_FORM_DATA) { |
content::RecordAction(UserMetricsAction("ClearBrowsingData_Autofill")); |
scoped_refptr<autofill::AutofillWebDataService> web_data_service = |
@@ -852,10 +892,15 @@ void BrowsingDataRemover::RemoveImpl(const TimeRange& time_range, |
content::StoragePartition::QUOTA_MANAGED_STORAGE_MASK_PERSISTENT; |
} |
+ content::StoragePartition::CookieMatcherFunction cookie_matcher; |
+ if (!origin_filter.IsEmptyBlacklist()) { |
+ cookie_matcher = origin_filter.BuildDomainCookieFilter(); |
+ } |
storage_partition->ClearData( |
- storage_partition_remove_mask, quota_storage_remove_mask, remove_url, |
- base::Bind(&DoesOriginMatchMask, origin_type_mask_), delete_begin_, |
- delete_end_, |
+ storage_partition_remove_mask, quota_storage_remove_mask, |
+ base::Bind(&DoesOriginMatchMaskAndUrls, origin_type_mask_, |
+ same_origin_filter), |
+ cookie_matcher, delete_begin_, delete_end_, |
base::Bind(&BrowsingDataRemover::OnClearedStoragePartitionData, |
weak_ptr_factory_.GetWeakPtr())); |
} |
@@ -936,8 +981,10 @@ void BrowsingDataRemover::RemoveImpl(const TimeRange& time_range, |
offline_pages::IsOfflinePagesEnabled()) { |
waiting_for_clear_offline_page_data_ = true; |
offline_pages::OfflinePageModelFactory::GetForBrowserContext(profile_) |
- ->ClearAll(base::Bind(&BrowsingDataRemover::OnClearedOfflinePageData, |
- weak_ptr_factory_.GetWeakPtr())); |
+ ->ClearWithURLPredicate( |
+ same_origin_filter, |
+ base::Bind(&BrowsingDataRemover::OnClearedOfflinePageData, |
+ weak_ptr_factory_.GetWeakPtr())); |
} |
#endif |
@@ -969,6 +1016,24 @@ void BrowsingDataRemover::OverrideStoragePartitionForTesting( |
storage_partition_for_testing_ = storage_partition; |
} |
+void BrowsingDataRemover::ClearSettingsForOneTypeWithPredicate( |
+ HostContentSettingsMap* content_settings_map, |
+ ContentSettingsType content_type, |
+ const base::Callback<bool(const ContentSettingsPattern& primary_pattern, |
+ const ContentSettingsPattern& secondary_pattern)>& |
+ predicate) { |
+ ContentSettingsForOneType settings; |
+ content_settings_map->GetSettingsForOneType(content_type, std::string(), |
+ &settings); |
+ for (const ContentSettingPatternSource& setting : settings) { |
+ if (predicate.Run(setting.primary_pattern, setting.secondary_pattern)) { |
+ content_settings_map->SetWebsiteSettingCustomScope( |
+ setting.primary_pattern, setting.secondary_pattern, content_type, |
+ std::string(), nullptr); |
+ } |
+ } |
+} |
+ |
base::Time BrowsingDataRemover::CalculateBeginDeleteTime( |
TimePeriod time_period) { |
base::TimeDelta diff; |