Write last_modified date to Content Settings in the PrefProvider

chrome/browser/content_settings/host_content_settings_map_unittest.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 <memory>
 #include <string>
 #include <utility>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 23 matching lines @@
 #include "url/gurl.h"
 
 using content::BrowserThread;
 
 using ::testing::_;
 
 namespace {
 
 bool MatchPrimaryPattern(const ContentSettingsPattern& expected_primary,
                          const ContentSettingsPattern& primary_pattern,
-                         const ContentSettingsPattern& secondary_pattern) {
+                         const ContentSettingsPattern& secondary_pattern,
+                         base::Time last_modified) {
   return expected_primary == primary_pattern;
 }
 
+bool MatchLastModified(base::Time begin_time,
+                       const ContentSettingsPattern& primary_pattern,
+                       const ContentSettingsPattern& secondary_pattern,
+                       base::Time last_modified) {
+  return last_modified >= begin_time;
+}
+
 }  // namespace
 
 class HostContentSettingsMapTest : public testing::Test {
  public:
   HostContentSettingsMapTest() : ui_thread_(BrowserThread::UI, &message_loop_) {
   }
 
  protected:
   const std::string& GetPrefName(ContentSettingsType type) {
     return content_settings::WebsiteSettingsRegistry::GetInstance()
@@ skipping 1678 matching lines @@
       CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT,
       base::Bind(&MatchPrimaryPattern, http_pattern));
   // Verify we only have one, and it's url1.
   host_content_settings_map->GetSettingsForOneType(
       CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT, std::string(), &host_settings);
   EXPECT_EQ(1u, host_settings.size());
   EXPECT_EQ(ContentSettingsPattern::FromURLNoWildcard(url1),
             host_settings[0].primary_pattern);
 }
 
+TEST_F(HostContentSettingsMapTest, ClearSettingsForOneTypeWithPredicateTime) {
+  if (!HostContentSettingsMap::kStoreLastModified) {
+    return;
+  }
+  TestingProfile profile;
+  HostContentSettingsMap* host_content_settings_map =
+      HostContentSettingsMapFactory::GetForProfile(&profile);
+  ContentSettingsForOneType host_settings;
+
+  GURL url1("https://www.google.com/");
+  GURL url2("https://maps.google.com/");
+
+  // Add setting for url1.
+  host_content_settings_map->SetContentSettingDefaultScope(
+      url1, GURL(), CONTENT_SETTINGS_TYPE_POPUPS, std::string(),
+      CONTENT_SETTING_BLOCK);
+
+  base::Time t2 = base::Time::Now();
+  // Add setting for url2.
+  host_content_settings_map->SetContentSettingDefaultScope(
+      url2, GURL(), CONTENT_SETTINGS_TYPE_POPUPS, std::string(),
+      CONTENT_SETTING_BLOCK);
+
+  // Verify we have two pattern and the default.
+  host_content_settings_map->GetSettingsForOneType(
+      CONTENT_SETTINGS_TYPE_POPUPS, std::string(), &host_settings);
+  EXPECT_EQ(3u, host_settings.size());
+
+  // Clear all settings since t2.
+  host_content_settings_map->ClearSettingsForOneTypeWithPredicate(
+      CONTENT_SETTINGS_TYPE_POPUPS, base::Bind(&MatchLastModified, t2));
+
+  // Verify we only have one pattern (url1) and the default.
+  host_content_settings_map->GetSettingsForOneType(
+      CONTENT_SETTINGS_TYPE_POPUPS, std::string(), &host_settings);
+  EXPECT_EQ(2u, host_settings.size());
+  EXPECT_EQ("https://www.google.com:443",
+            host_settings[0].primary_pattern.ToString());
+  EXPECT_EQ("*", host_settings[1].primary_pattern.ToString());
+}

[msramek, 2017/04/19 10:49:16]

Please also add a test with resource identifiers.

[dullweber, 2017/04/19 15:02:45]

I added a test and discovered that ClearSettingsForOneTypeWithPredicate
currently doesn't work for resource settings because internally it calls
GetSettingsForOneType(type, std::string()). I changed it to also have a
resource_identifier parameter but that might be unnecessary if we remove all
resource_identifier

+
 TEST_F(HostContentSettingsMapTest, CanSetNarrowestSetting) {
   TestingProfile profile;
   const auto* map = HostContentSettingsMapFactory::GetForProfile(&profile);
 
   GURL valid_url("http://google.com");
   EXPECT_TRUE(map->CanSetNarrowestContentSetting(
       valid_url, valid_url,
       CONTENT_SETTINGS_TYPE_POPUPS));
 
   GURL invalid_url("about:blank");
   EXPECT_FALSE(map->CanSetNarrowestContentSetting(
       invalid_url, invalid_url,
       CONTENT_SETTINGS_TYPE_POPUPS));
 }