Remove the content settings dependencies from BrowsingDataFilterBuilder et al.

chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc

 // Copyright 2016 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/browsing_data/chrome_browsing_data_remover_delegate.h"
 
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browsing_data/browsing_data_filter_builder.h"
@@ skipping 110 matching lines @@
   callback.Run();
 }
 
 // Another convenience method to turn a callback without arguments into one that
 // accepts (and ignores) a single argument.
 template <typename T>
 base::Callback<void(T)> IgnoreArgument(const base::Closure& callback) {
   return base::Bind(&IgnoreArgumentHelper<T>, callback);
 }
 
-bool ForwardPrimaryPatternCallback(
-    const base::Callback<bool(const ContentSettingsPattern&)> predicate,
+bool WebsiteSettingsFilterAdapter(
+    const base::Callback<bool(const GURL&)> predicate,
     const ContentSettingsPattern& primary_pattern,
     const ContentSettingsPattern& secondary_pattern) {
-  return predicate.Run(primary_pattern);
+  // Ignore the default setting.
+  if (primary_pattern == ContentSettingsPattern::Wildcard())
+    return false;
+
+  // Website settings only use origin-scoped patterns. The only content setting
+  // currently supported by ChromeBrowsingDataRemoverDelegate is
+  // DURABLE_STORAGE, which also only uses origin-scoped patterns. Such patterns
+  // can be directly translated to a GURL.
+  GURL url(primary_pattern.ToString());
+  DCHECK(url.is_valid());

[Mike West, 2017/01/09 08:53:48]

What happens if this DCHECK fails in Release? Will passing an invalid URL to
`predicate.Run()` explode somewhere in an ugly way?

[msramek, 2017/01/09 09:39:43]

An invalid URL will be passed to the filter, where we will try to match it with
listed origins (OriginFilterBuilder) or domains
(RegistrableDomainFilterBuilder). It will not be equal to any entry, which means
it will never be matched by whitelist and always be by blacklist. But it will
not explode.

I have already reached to raymes@ to discuss this, as the way we use
ContentSettingPattern in places where Origin would suffice seems cumbersome (and
I'm actually surprised this is the first time it comes up). This DCHECK should
eventually be handled somewhere in WebsiteSettingsRegistry.

+  return predicate.Run(url);
 }
 
 #if !defined(DISABLE_NACL)
 void ClearNaClCacheOnIOThread(const base::Closure& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   nacl::NaClBrowser::GetInstance()->ClearValidationCache(callback);
 }
 
 void ClearPnaclCacheOnIOThread(base::Time begin,
@@ skipping 99 matching lines @@
   //////////////////////////////////////////////////////////////////////////////
   // INITIALIZATION
   synchronous_clear_operations_.Start();
   callback_ = callback;
 
   delete_begin_ = delete_begin;
   delete_end_ = delete_end;
 
   base::Callback<bool(const GURL& url)> filter =
       filter_builder.BuildGeneralFilter();
-  base::Callback<bool(const ContentSettingsPattern& url)> same_pattern_filter =
-      filter_builder.BuildWebsiteSettingsPatternMatchesFilter();
 
   // Some backends support a filter that |is_null()| to make complete deletion
   // more efficient.
   base::Callback<bool(const GURL&)> nullable_filter =
       filter_builder.IsEmptyBlacklist() ? base::Callback<bool(const GURL&)>()
                                         : filter;
 
   // Managed devices and supervised users can have restrictions on history
   // deletion.
   PrefService* prefs = profile_->GetPrefs();
@@ skipping 266 matching lines @@
 
     MediaDeviceIDSalt::Reset(profile_->GetPrefs());
   }
 
   //////////////////////////////////////////////////////////////////////////////
   // REMOVE_DURABLE_PERMISSION
   if (remove_mask & BrowsingDataRemover::REMOVE_DURABLE_PERMISSION) {
     HostContentSettingsMapFactory::GetForProfile(profile_)
         ->ClearSettingsForOneTypeWithPredicate(
             CONTENT_SETTINGS_TYPE_DURABLE_STORAGE,
-            base::Bind(&ForwardPrimaryPatternCallback, same_pattern_filter));
+            base::Bind(&WebsiteSettingsFilterAdapter, filter));
   }
 
   //////////////////////////////////////////////////////////////////////////////
   // REMOVE_SITE_USAGE_DATA
   if (remove_mask & BrowsingDataRemover::REMOVE_SITE_USAGE_DATA) {
     HostContentSettingsMapFactory::GetForProfile(profile_)
         ->ClearSettingsForOneTypeWithPredicate(
             CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT,
-            base::Bind(&ForwardPrimaryPatternCallback, same_pattern_filter));
+            base::Bind(&WebsiteSettingsFilterAdapter, filter));
   }
 
   if ((remove_mask & BrowsingDataRemover::REMOVE_SITE_USAGE_DATA) ||
       (remove_mask & BrowsingDataRemover::REMOVE_HISTORY)) {
     HostContentSettingsMapFactory::GetForProfile(profile_)
         ->ClearSettingsForOneTypeWithPredicate(
             CONTENT_SETTINGS_TYPE_APP_BANNER,
-            base::Bind(&ForwardPrimaryPatternCallback, same_pattern_filter));
+            base::Bind(&WebsiteSettingsFilterAdapter, filter));
 
     PermissionDecisionAutoBlocker::RemoveCountsByUrl(profile_, filter);
   }
 
   //////////////////////////////////////////////////////////////////////////////
   // Password manager
   if (remove_mask & BrowsingDataRemover::REMOVE_PASSWORDS) {
     content::RecordAction(UserMetricsAction("ClearBrowsingData_Passwords"));
     password_manager::PasswordStore* password_store =
         PasswordStoreFactory::GetForProfile(
@@ skipping 286 matching lines @@
 
 #if defined(OS_CHROMEOS)
 void ChromeBrowsingDataRemoverDelegate::OnClearPlatformKeys(
     chromeos::DBusMethodCallStatus call_status,
     bool result) {
   LOG_IF(ERROR, call_status != chromeos::DBUS_METHOD_CALL_SUCCESS || !result)
       << "Failed to clear platform keys.";
   clear_platform_keys_.GetCompletionCallback().Run();
 }
 #endif