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

android_webview/browser/net/aw_cookie_store_wrapper.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/browser/net/aw_cookie_store_wrapper.h"
 
 #include <string>
 
 #include "android_webview/browser/net/init_native_callback.h"
 #include "base/memory/ref_counted_delete_on_message_loop.h"
@@ skipping 149 matching lines @@
 }
 
 void DeleteAllCreatedBetweenAsyncOnCookieThread(
     const base::Time& delete_begin,
     const base::Time& delete_end,
     const net::CookieStore::DeleteCallback& callback) {
   GetCookieStore()->DeleteAllCreatedBetweenAsync(delete_begin, delete_end,
                                                  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(
     const net::CookieStore::DeleteCallback& callback) {
   GetCookieStore()->DeleteSessionCookiesAsync(callback);
 }
 
 void FlushStoreOnCookieThread(const base::Closure& callback) {
   GetCookieStore()->FlushStore(callback);
 }
@@ skipping 93 matching lines @@
 void AwCookieStoreWrapper::DeleteAllCreatedBetweenAsync(
     const base::Time& delete_begin,
     const base::Time& delete_end,
     const DeleteCallback& callback) {
   DCHECK(client_task_runner_->RunsTasksOnCurrentThread());
   PostTaskToCookieStoreTaskRunner(
       base::Bind(&DeleteAllCreatedBetweenAsyncOnCookieThread, delete_begin,
                  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(
     const DeleteCallback& callback) {
   DCHECK(client_task_runner_->RunsTasksOnCurrentThread());
   PostTaskToCookieStoreTaskRunner(
       base::Bind(&DeleteSessionCookiesAsyncOnCookieThread,
                  CreateWrappedCallback<int>(callback)));
 }
 
@@ skipping 39 matching lines @@
                     base::Bind(&AwCookieStoreWrapper::RunClosureCallback,
                                weak_factory_.GetWeakPtr(), callback));
 }
 
 void AwCookieStoreWrapper::RunClosureCallback(const base::Closure& callback) {
   DCHECK(client_task_runner_->RunsTasksOnCurrentThread());
   callback.Run();
 }
 
 }  // namespace android_webview