Add origin-based deletion to BrowsingDataRemover

chrome/browser/search_engines/template_url_service.cc

Index: chrome/browser/search_engines/template_url_service.cc
diff --git a/chrome/browser/search_engines/template_url_service.cc b/chrome/browser/search_engines/template_url_service.cc
index a44c6a5f510fbb7230e6b6ac742ea17429120120..d6588caea3f01671717920ef31c506e200bca7b5 100644
--- a/chrome/browser/search_engines/template_url_service.cc
+++ b/chrome/browser/search_engines/template_url_service.cc
@@ -319,12 +319,26 @@ void TemplateURLService::Remove(const TemplateURL* template_url) {
 
 void TemplateURLService::RemoveAutoGeneratedBetween(base::Time created_after,
                                                     base::Time created_before) {
+  RemoveAutoGeneratedForOriginBetween(created_after, created_before, GURL());
+}
+
+void TemplateURLService::RemoveAutoGeneratedSince(base::Time created_after) {

[Peter Kasting, 2012/02/16 18:16:35]

Nit: I suggest implementing by chaining the call to the 2-arg version of
RemoveAutoGeneratedBetween() rather than the 3-arg version, which will make
future maintenance a tiny fraction easier.

If you do that it might also be fractionally clearer to reverse the order of
these first two functions here and in the header.

[Use mkwst_at_chromium.org plz., 2012/02/17 10:12:36]

Done.

+  RemoveAutoGeneratedForOriginBetween(created_after, base::Time(), GURL());
+}
+
+void TemplateURLService::RemoveAutoGeneratedForOriginBetween(
+    base::Time created_after,
+    base::Time created_before,
+    const GURL& origin) {

[Peter Kasting, 2012/02/16 18:16:35]

Nit: If you're going to name the function this way then put the arguments in the
same order -- first |origin|, then the times.

[Use mkwst_at_chromium.org plz., 2012/02/16 18:35:03]

If you have a suggestion for a different name, I'm happy to change it. This was
just the first thing I came up with, not a deeply considered evaluation. :)

[Use mkwst_at_chromium.org plz., 2012/02/17 10:12:36]

Done.

+  GURL o(origin.GetOrigin());
   bool should_notify = false;
   for (size_t i = 0; i < template_urls_.size();) {
     if (template_urls_[i]->date_created() >= created_after &&
         (created_before.is_null() ||
          template_urls_[i]->date_created() < created_before) &&
-        CanReplace(template_urls_[i])) {
+        CanReplace(template_urls_[i]) &&
+        (o.is_empty() ||
+         GenerateSearchURL(template_urls_[i]).GetOrigin() == o)) {
       RemoveNoNotify(template_urls_[i]);
       should_notify = true;
     } else {
@@ -335,9 +349,6 @@ void TemplateURLService::RemoveAutoGeneratedBetween(base::Time created_after,
     NotifyObservers();
 }
 
-void TemplateURLService::RemoveAutoGeneratedSince(base::Time created_after) {
-  RemoveAutoGeneratedBetween(created_after, base::Time());
-}
 
 void TemplateURLService::RegisterExtensionKeyword(const Extension* extension) {
   // TODO(mpcomplete): disable the keyword when the extension is disabled.