Audit the last usage of Geolocation and Notification permissions.

chrome/browser/content_settings/host_content_settings_map.h

Index: chrome/browser/content_settings/host_content_settings_map.h
diff --git a/chrome/browser/content_settings/host_content_settings_map.h b/chrome/browser/content_settings/host_content_settings_map.h
index 8d5681a1536a92a9e18978146b253f66554431db..f3d7a95b98420c17a647fb0137ed2d8631e1a414 100644
--- a/chrome/browser/content_settings/host_content_settings_map.h
+++ b/chrome/browser/content_settings/host_content_settings_map.h
@@ -27,6 +27,7 @@ class GURL;
 class PrefService;
 
 namespace base {
+class Clock;
 class Value;
 }
 
@@ -199,6 +200,37 @@ class HostContentSettingsMap
     return is_off_the_record_;
   }
 
+  // Returns a single |ContentSetting| which applies to the given URLs, just as
+  // |GetContentSetting| does. If the setting is allowed, it also records the
+  // last usage to preferences.
+  //
+  // This should only be called on the UI thread, unlike |GetContentSetting|.
+  ContentSetting GetContentSettingAndMaybeUpdateLastUsage(
+      const GURL& primary_url,

[Michael van Ouwerkerk, 2014/07/01 12:53:36]

Do primary_url and secondary_url correspond to requesting_frame and embedder?

[Daniel Nishi, 2014/07/01 18:37:48]

That's how it seems to work from Geolocations permissions context. There's a bit
of a discrepancy in how Geolocation & Midi do this and how Notifications does
this.

Notifications seems to throw the SecurityOrigin in a GURL and say it's both,
whereas Geolocation and Midi make a distinction between requesting_frame and
embedder.

[Michael van Ouwerkerk, 2014/07/02 18:51:15]

Right. It's for distinguishing between iframes and top level frames. We'll need
to sort out the terminology for this across chrome, but that's for a later cl,
probably for someone else.

+      const GURL& secondary_url,
+      ContentSettingsType content_type,
+      const std::string& resource_identifier);
+
+  void UpdateLastUsage(const GURL& primary_url,

[Michael van Ouwerkerk, 2014/07/01 11:02:23]

Please document this public method.

[Daniel Nishi, 2014/07/01 18:37:48]

Done.

+                       const GURL& secondary_url,
+                       ContentSettingsType content_type);
+
+  // Returns the last time the pattern that matches the URL has requested
+  // permission for the |content_type| setting.
+  base::Time GetLastUsage(const GURL& primary_url,
+                          const GURL& secondary_url,
+                          ContentSettingsType content_type);
+
+  // Returns the last time the pattern has requested permission for the
+  // |content_type| setting.
+  base::Time GetLastUsageByPattern(
+      const ContentSettingsPattern& primary_pattern,
+      const ContentSettingsPattern& secondary_pattern,
+      ContentSettingsType content_type);
+
+  // Passes ownership of |clock|.
+  void SetPrefClockForTesting(base::Clock* clock);
+
  private:
   friend class base::RefCountedThreadSafe<HostContentSettingsMap>;
   friend class HostContentSettingsMapTest_NonDefaultSettings_Test;
@@ -236,6 +268,12 @@ class HostContentSettingsMap
   // it is not being called too late.
   void UsedContentSettingsProviders() const;
 
+  // Convenience method for updating the last usage of a content type for a
+  // pattern.
+  void UpdateLastUsageByPattern(const ContentSettingsPattern& primary_pattern,
+                                const ContentSettingsPattern& secondary_pattern,
+                                ContentSettingsType content_type);
+
 #ifndef NDEBUG
   // This starts as the thread ID of the thread that constructs this
   // object, and remains until used by a different thread, at which