Write last_modified date to Content Settings in the PrefProvider

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 <set>
 #include <string>
 #include <utility>
 
@@ skipping 132 matching lines @@
 
 // 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 WebsiteSettingsFilterAdapter(
     const base::Callback<bool(const GURL&)> predicate,
+    base::Time begin_time,
     const ContentSettingsPattern& primary_pattern,
-    const ContentSettingsPattern& secondary_pattern) {
+    const ContentSettingsPattern& secondary_pattern,
+    base::Time last_modified) {
   // Ignore the default setting.
   if (primary_pattern == ContentSettingsPattern::Wildcard())
     return false;
 
+  // Ignore entries that are too old.
+  if (last_modified < begin_time) {
+    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());
   return predicate.Run(url);
 }
 
 #if !defined(DISABLE_NACL)
@@ skipping 529 matching lines @@
     }
 
     MediaDeviceIDSalt::Reset(profile_->GetPrefs());
   }
 
   //////////////////////////////////////////////////////////////////////////////
   // DATA_TYPE_DURABLE_PERMISSION
   if (remove_mask & DATA_TYPE_DURABLE_PERMISSION) {
     HostContentSettingsMapFactory::GetForProfile(profile_)
         ->ClearSettingsForOneTypeWithPredicate(
-            CONTENT_SETTINGS_TYPE_DURABLE_STORAGE,
-            base::Bind(&WebsiteSettingsFilterAdapter, filter));
+            CONTENT_SETTINGS_TYPE_DURABLE_STORAGE, std::string(),
+            base::Bind(&WebsiteSettingsFilterAdapter, filter, base::Time()));
   }
 
   //////////////////////////////////////////////////////////////////////////////
   // DATA_TYPE_SITE_USAGE_DATA
   if (remove_mask & DATA_TYPE_SITE_USAGE_DATA) {
     HostContentSettingsMapFactory::GetForProfile(profile_)
         ->ClearSettingsForOneTypeWithPredicate(
-            CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT,
-            base::Bind(&WebsiteSettingsFilterAdapter, filter));
+            CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT, std::string(),
+            base::Bind(&WebsiteSettingsFilterAdapter, filter, base::Time()));
   }
 
   if ((remove_mask & DATA_TYPE_SITE_USAGE_DATA) ||
       (remove_mask & DATA_TYPE_HISTORY)) {
     HostContentSettingsMapFactory::GetForProfile(profile_)
         ->ClearSettingsForOneTypeWithPredicate(
-            CONTENT_SETTINGS_TYPE_APP_BANNER,
-            base::Bind(&WebsiteSettingsFilterAdapter, filter));
+            CONTENT_SETTINGS_TYPE_APP_BANNER, std::string(),
+            base::Bind(&WebsiteSettingsFilterAdapter, filter, base::Time()));
 
     PermissionDecisionAutoBlocker::GetForProfile(profile_)->RemoveCountsByUrl(
         filter);
   }
 
   //////////////////////////////////////////////////////////////////////////////
   // Password manager
   if (remove_mask & DATA_TYPE_PASSWORDS) {
     base::RecordAction(UserMetricsAction("ClearBrowsingData_Passwords"));
     password_manager::PasswordStore* password_store =
@@ skipping 397 matching lines @@
 }
 
 void ChromeBrowsingDataRemoverDelegate::
 OnDeauthorizeFlashContentLicensesCompleted(
     uint32_t request_id,
     bool /* success */) {
   DCHECK_EQ(request_id, deauthorize_flash_content_licenses_request_id_);
   clear_flash_content_licenses_.GetCompletionCallback().Run();
 }
 #endif