Support origin-based deletion for password store statistics

components/password_manager/core/browser/password_store.h

Index: components/password_manager/core/browser/password_store.h
diff --git a/components/password_manager/core/browser/password_store.h b/components/password_manager/core/browser/password_store.h
index 250ab15e5af0f066a5bb70fd0fcbc6bbc8c3ecff..20b4c548d9340a92338b9b9692b6da70d9254aa1 100644
--- a/components/password_manager/core/browser/password_store.h
+++ b/components/password_manager/core/browser/password_store.h
@@ -142,13 +142,16 @@ class PasswordStore : protected PasswordStoreSync,
   void RemoveLoginsSyncedBetween(base::Time delete_begin,
                                  base::Time delete_end);
 
-  // Removes all the stats created in the given date range. If |completion| is
-  // not null, it will be posted to the |main_thread_runner_| after deletions
-  // have been completed.
+  // Removes all the stats created in the given the date range.

[vabr (Chromium), 2016/09/08 09:04:36]

nit: The added "the" in "the data range" seems out of place.

[msramek, 2016/09/08 10:45:28]

Done. No the idea how that got there :)

+  // If |origin_filter| is not null, only statistics for matching origins are
+  // removed. If |completion| is not null, it will be posted to the
+  // |main_thread_runner_| after deletions have been completed.
   // Should be called on the UI thread.
-  void RemoveStatisticsCreatedBetween(base::Time delete_begin,
-                                      base::Time delete_end,
-                                      const base::Closure& completion);
+  void RemoveStatisticsByOriginAndTime(
+      const base::Callback<bool(const GURL&)>& origin_filter,
+      base::Time delete_begin,
+      base::Time delete_end,
+      const base::Closure& completion);
 
   // Sets the 'skip_zero_click' flag for all logins in the database that match
   // |origin_filter| to 'true'. |completion| will be posted to
@@ -282,8 +285,10 @@ class PasswordStore : protected PasswordStoreSync,
       base::Time delete_end) = 0;
 
   // Synchronous implementation to remove the statistics.
-  virtual bool RemoveStatisticsCreatedBetweenImpl(base::Time delete_begin,
-                                                  base::Time delete_end) = 0;
+  virtual bool RemoveStatisticsByOriginAndTimeImpl(
+      const base::Callback<bool(const GURL&)>& origin_filter,
+      base::Time delete_begin,
+      base::Time delete_end) = 0;
 
   // Synchronous implementation to disable auto sign-in.
   virtual PasswordStoreChangeList DisableAutoSignInForOriginsImpl(
@@ -386,9 +391,11 @@ class PasswordStore : protected PasswordStoreSync,
                                           const base::Closure& completion);
   void RemoveLoginsSyncedBetweenInternal(base::Time delete_begin,
                                          base::Time delete_end);
-  void RemoveStatisticsCreatedBetweenInternal(base::Time delete_begin,
-                                              base::Time delete_end,
-                                              const base::Closure& completion);
+  void RemoveStatisticsByOriginAndTimeInternal(
+      const base::Callback<bool(const GURL&)>& origin_filter,
+      base::Time delete_begin,
+      base::Time delete_end,
+      const base::Closure& completion);
   void DisableAutoSignInForOriginsInternal(
       const base::Callback<bool(const GURL&)>& origin_filter,
       const base::Closure& completion);