[CookieStore] Upgrading host-based deleting to predicate-based deleting.

ios/chrome/browser/browsing_data/ios_chrome_browsing_data_remover.mm

Index: ios/chrome/browser/browsing_data/ios_chrome_browsing_data_remover.mm
diff --git a/ios/chrome/browser/browsing_data/ios_chrome_browsing_data_remover.mm b/ios/chrome/browser/browsing_data/ios_chrome_browsing_data_remover.mm
index c7f6990a856a259b2d463a6d47348313cc61e3df..6d583f89f5b97f25049664ca8a2b6a6ec96f653b 100644
--- a/ios/chrome/browser/browsing_data/ios_chrome_browsing_data_remover.mm
+++ b/ios/chrome/browser/browsing_data/ios_chrome_browsing_data_remover.mm
@@ -38,6 +38,7 @@
 #include "ios/web/public/user_metrics.h"
 #include "ios/web/public/web_thread.h"
 #include "net/base/net_errors.h"
+#include "net/cookies/canonical_cookie.h"

[droger, 2016/04/05 19:17:30]

This may not be needed.

[dmurph, 2016/04/05 22:15:54]

Done.

 #include "net/cookies/cookie_store.h"
 #include "net/http/transport_security_state.h"
 #include "net/ssl/channel_id_service.h"
@@ -126,11 +127,10 @@ void IOSChromeBrowsingDataRemover::set_removing(bool is_removing) {
 }
 
 void IOSChromeBrowsingDataRemover::Remove(int remove_mask) {
-  RemoveImpl(remove_mask, GURL());
+  RemoveImpl(remove_mask);
 }
 
-void IOSChromeBrowsingDataRemover::RemoveImpl(int remove_mask,
-                                              const GURL& remove_url) {
+void IOSChromeBrowsingDataRemover::RemoveImpl(int remove_mask) {
   DCHECK_CURRENTLY_ON(WebThread::UI);
   set_removing(true);
   remove_mask_ = remove_mask;
@@ -148,8 +148,6 @@ void IOSChromeBrowsingDataRemover::RemoveImpl(int remove_mask,
             browser_state_, ServiceAccessType::EXPLICIT_ACCESS);
     if (history_service) {
       std::set<GURL> restrict_urls;
-      if (!remove_url.is_empty())
-        restrict_urls.insert(remove_url);
       web::RecordAction(UserMetricsAction("ClearBrowsingData_History"));
       waiting_for_clear_history_ = true;
 
@@ -191,21 +189,19 @@ void IOSChromeBrowsingDataRemover::RemoveImpl(int remove_mask,
         waiting_for_clear_keyword_data_ = true;
       } else if (keywords_model) {
         keywords_model->RemoveAutoGeneratedForOriginBetween(
-            remove_url, delete_begin_, delete_end_);
+            GURL(), delete_begin_, delete_end_);
       }
     }
 
     // If the caller is removing history for all hosts, then clear ancillary
     // historical information.
-    if (remove_url.is_empty()) {
-      // We also delete the list of recently closed tabs. Since these expire,
-      // they can't be more than a day old, so we can simply clear them all.
-      sessions::TabRestoreService* tab_service =
-          IOSChromeTabRestoreServiceFactory::GetForBrowserState(browser_state_);
-      if (tab_service) {
-        tab_service->ClearEntries();
-        tab_service->DeleteLastSession();
-      }
+    // We also delete the list of recently closed tabs. Since these expire,
+    // they can't be more than a day old, so we can simply clear them all.
+    sessions::TabRestoreService* tab_service =
+        IOSChromeTabRestoreServiceFactory::GetForBrowserState(browser_state_);
+    if (tab_service) {
+      tab_service->ClearEntries();
+      tab_service->DeleteLastSession();
     }
 
     // The saved Autofill profiles and credit cards can include the origin from
@@ -249,7 +245,7 @@ void IOSChromeBrowsingDataRemover::RemoveImpl(int remove_mask,
         WebThread::PostTask(
             WebThread::IO, FROM_HERE,
             base::Bind(&IOSChromeBrowsingDataRemover::ClearCookiesOnIOThread,
-                       base::Unretained(this), safe_browsing_context, GURL()));
+                       base::Unretained(this), safe_browsing_context));
       }
     }
 
@@ -257,7 +253,7 @@ void IOSChromeBrowsingDataRemover::RemoveImpl(int remove_mask,
     WebThread::PostTask(
         WebThread::IO, FROM_HERE,
         base::Bind(&IOSChromeBrowsingDataRemover::ClearCookiesOnIOThread,
-                   base::Unretained(this), main_context_getter_, remove_url));
+                   base::Unretained(this), main_context_getter_));
 
     // TODO(mkwst): If we're not removing passwords, then clear the 'zero-click'
     // flag for all credentials in the password store.
@@ -471,22 +467,14 @@ void IOSChromeBrowsingDataRemover::OnClearedCookies(int num_deleted) {
 }
 
 void IOSChromeBrowsingDataRemover::ClearCookiesOnIOThread(
-    const scoped_refptr<net::URLRequestContextGetter>& rq_context,
-    const GURL& storage_url) {
+    const scoped_refptr<net::URLRequestContextGetter>& rq_context) {
   DCHECK_CURRENTLY_ON(WebThread::IO);
   net::CookieStore* cookie_store =
       rq_context->GetURLRequestContext()->cookie_store();
-  if (storage_url.is_empty()) {
-    cookie_store->DeleteAllCreatedBetweenAsync(
-        delete_begin_, delete_end_,
-        base::Bind(&IOSChromeBrowsingDataRemover::OnClearedCookies,
-                   base::Unretained(this)));
-  } else {
-    cookie_store->DeleteAllCreatedBetweenForHostAsync(
-        delete_begin_, delete_end_, storage_url,
-        base::Bind(&IOSChromeBrowsingDataRemover::OnClearedCookies,
-                   base::Unretained(this)));
-  }
+  cookie_store->DeleteAllCreatedBetweenAsync(
+      delete_begin_, delete_end_,
+      base::Bind(&IOSChromeBrowsingDataRemover::OnClearedCookies,
+                 base::Unretained(this)));
 }
 
 void IOSChromeBrowsingDataRemover::ClearChannelIDsOnIOThread(