Extend the origin-based deletion in TemplateURLService to an URL filter

components/search_engines/template_url_service.cc

Index: components/search_engines/template_url_service.cc
diff --git a/components/search_engines/template_url_service.cc b/components/search_engines/template_url_service.cc
index e89bfb30cc50662c0f1adac026c414562024217a..772db1a9c04bfbb3c1c2174f3b193e0bd6943d3e 100644
--- a/components/search_engines/template_url_service.cc
+++ b/components/search_engines/template_url_service.cc
@@ -8,6 +8,7 @@
 #include <utility>
 
 #include "base/auto_reset.h"
+#include "base/callback.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/guid.h"
@@ -508,14 +509,14 @@ void TemplateURLService::RemoveAutoGeneratedSince(base::Time created_after) {
 
 void TemplateURLService::RemoveAutoGeneratedBetween(base::Time created_after,
                                                     base::Time created_before) {
-  RemoveAutoGeneratedForOriginBetween(GURL(), created_after, created_before);
+  RemoveAutoGeneratedForUrlsBetween(base::Callback<bool(const GURL&)>(),
+                                    created_after, created_before);
 }
 
-void TemplateURLService::RemoveAutoGeneratedForOriginBetween(
-    const GURL& origin,
+void TemplateURLService::RemoveAutoGeneratedForUrlsBetween(
+    const base::Callback<bool(const GURL&)>& url_filter,
     base::Time created_after,
     base::Time created_before) {
-  GURL o(origin.GetOrigin());
   bool should_notify = false;
   KeywordWebDataService::BatchModeScoper scoper(web_data_service_.get());
   for (size_t i = 0; i < template_urls_.size();) {
@@ -523,9 +524,9 @@ void TemplateURLService::RemoveAutoGeneratedForOriginBetween(
         (created_before.is_null() ||
          template_urls_[i]->date_created() < created_before) &&
         CanReplace(template_urls_[i]) &&
-        (o.is_empty() ||
-         template_urls_[i]->GenerateSearchURL(
-             search_terms_data()).GetOrigin() == o)) {
+        (url_filter.is_null() ||
+         url_filter.Run(
+             template_urls_[i]->GenerateSearchURL(search_terms_data())))) {
       RemoveNoNotify(template_urls_[i]);
       should_notify = true;
     } else {