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

android_webview/browser/net/aw_cookie_store_wrapper.cc

Index: android_webview/browser/net/aw_cookie_store_wrapper.cc
diff --git a/android_webview/browser/net/aw_cookie_store_wrapper.cc b/android_webview/browser/net/aw_cookie_store_wrapper.cc
index 2c4531f35df4d85d67d8ea6239420303c919a641..7195ef290b4b3a1ae4424f62ef8af77a7fd454f7 100644
--- a/android_webview/browser/net/aw_cookie_store_wrapper.cc
+++ b/android_webview/browser/net/aw_cookie_store_wrapper.cc
@@ -167,13 +167,13 @@ void DeleteAllCreatedBetweenAsyncOnCookieThread(
                                                  callback);
 }
 
-void DeleteAllCreatedBetweenForHostAsyncOnCookieThread(
-    const base::Time delete_begin,
-    const base::Time delete_end,
-    const GURL& url,
+void DeleteAllCreatedBetweenWithPredicateAsyncOnCookieThread(
+    const base::Time& delete_begin,
+    const base::Time& delete_end,
+    const net::CookieStore::CookiePredicate& predicate,
     const net::CookieStore::DeleteCallback& callback) {
-  GetCookieStore()->DeleteAllCreatedBetweenForHostAsync(
-      delete_begin, delete_end, url, callback);
+  GetCookieStore()->DeleteAllCreatedBetweenWithPredicateAsync(
+      delete_begin, delete_end, predicate, callback);
 }
 
 void DeleteSessionCookiesAsyncOnCookieThread(
@@ -287,15 +287,15 @@ void AwCookieStoreWrapper::DeleteAllCreatedBetweenAsync(
                  delete_end, CreateWrappedCallback<int>(callback)));
 }
 
-void AwCookieStoreWrapper::DeleteAllCreatedBetweenForHostAsync(
-    const base::Time delete_begin,
-    const base::Time delete_end,
-    const GURL& url,
+void AwCookieStoreWrapper::DeleteAllCreatedBetweenWithPredicateAsync(
+    const base::Time& delete_begin,
+    const base::Time& delete_end,
+    const CookiePredicate& predicate,
     const DeleteCallback& callback) {
   DCHECK(client_task_runner_->RunsTasksOnCurrentThread());
   PostTaskToCookieStoreTaskRunner(base::Bind(
-      &DeleteAllCreatedBetweenForHostAsyncOnCookieThread, delete_begin,
-      delete_end, url, CreateWrappedCallback<int>(callback)));
+      &DeleteAllCreatedBetweenWithPredicateAsyncOnCookieThread, delete_begin,
+      delete_end, predicate, CreateWrappedCallback<int>(callback)));
 }
 
 void AwCookieStoreWrapper::DeleteSessionCookiesAsync(