Write last_modified date to Content Settings in the PrefProvider

components/content_settings/core/browser/content_settings_origin_identifier_value_map.h

Index: components/content_settings/core/browser/content_settings_origin_identifier_value_map.h
diff --git a/components/content_settings/core/browser/content_settings_origin_identifier_value_map.h b/components/content_settings/core/browser/content_settings_origin_identifier_value_map.h
index 1ac2fe56bed118f216876804e563e97c8d9a14a4..5168122684335692dd702a52e885ec235681d37d 100644
--- a/components/content_settings/core/browser/content_settings_origin_identifier_value_map.h
+++ b/components/content_settings/core/browser/content_settings_origin_identifier_value_map.h
@@ -13,6 +13,7 @@
 
 #include "base/macros.h"
 #include "base/memory/linked_ptr.h"
+#include "base/time/time.h"
 #include "components/content_settings/core/common/content_settings.h"
 
 class GURL;
@@ -44,7 +45,14 @@ class OriginIdentifierValueMap {
     bool operator<(const OriginIdentifierValueMap::PatternPair& other) const;
   };
 
-  typedef std::map<PatternPair, linked_ptr<base::Value> > Rules;
+  struct ValueEntry {
+    base::Time last_modified;
+    linked_ptr<base::Value> value;
+    ValueEntry();
+    ~ValueEntry();
+  };
+
+  typedef std::map<PatternPair, ValueEntry> Rules;
   typedef std::map<EntryMapKey, Rules> EntryMap;
 
   EntryMap::iterator begin() {
@@ -95,12 +103,12 @@ class OriginIdentifierValueMap {
   // Sets the |value| for the given |primary_pattern|, |secondary_pattern|,
   // |content_type|, |resource_identifier| tuple. The method takes the ownership
   // of the passed |value|.
-  void SetValue(
-      const ContentSettingsPattern& primary_pattern,
-      const ContentSettingsPattern& secondary_pattern,
-      ContentSettingsType content_type,
-      const ResourceIdentifier& resource_identifier,
-      base::Value* value);
+  void SetValue(const ContentSettingsPattern& primary_pattern,
+                const ContentSettingsPattern& secondary_pattern,
+                ContentSettingsType content_type,
+                const ResourceIdentifier& resource_identifier,
+                base::Time last_modified,

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

Given the number of callsites that pass base::Time(), we should probably have a
version of this method that doesn't take a time parameter.

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

Most calls with base::Time() are in tests. I added comments to the
content_settings_store and the internal_extension_provider to explain that we
don't pass a timestamp intentionally. Is it  ok to keep it this way?

+                base::Value* value);
 
   // Deletes the map entry for the given |primary_pattern|,
   // |secondary_pattern|, |content_type|, |resource_identifier| tuple.