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

components/search_engines/template_url_service.h

Index: components/search_engines/template_url_service.h
diff --git a/components/search_engines/template_url_service.h b/components/search_engines/template_url_service.h
index 06124c5d6c1e5c12edb6950c55fd4b07291fd812..a4ce879412ff15f1efa210248a09ce65de6e5899 100644
--- a/components/search_engines/template_url_service.h
+++ b/components/search_engines/template_url_service.h
@@ -202,11 +202,12 @@ class TemplateURLService : public WebDataServiceConsumer,
                                   base::Time created_before);
 
   // Removes all auto-generated keywords that were created in the specified
-  // range for a specified |origin|. If |origin| is empty, deletes all
+  // range and match |url_filter|. If |url_filter| is_null(), deletes all
   // auto-generated keywords in the range.
-  void RemoveAutoGeneratedForOriginBetween(const GURL& origin,
-                                           base::Time created_after,
-                                           base::Time created_before);
+  void RemoveAutoGeneratedForUrlsBetween(
+      const base::Callback<bool(const GURL&)>& url_filter,
+      base::Time created_after,
+      base::Time created_before);
 
   // Adds a TemplateURL for an extension with an omnibox keyword.
   // Only 1 keyword is allowed for a given extension. If a keyword