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

content/browser/storage_partition_impl.cc

 // Copyright (c) 2012 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 "content/browser/storage_partition_impl.h"
 
 #include <stddef.h>
 
 #include <set>
 #include <vector>
@@ skipping 48 matching lines @@
     const base::Closure& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   net::CookieStore* cookie_store = rq_context->
       GetURLRequestContext()->cookie_store();
   if (storage_origin.is_empty()) {
     cookie_store->DeleteAllCreatedBetweenAsync(
         begin,
         end,
         base::Bind(&OnClearedCookies, callback));
   } else {
-    cookie_store->DeleteAllCreatedBetweenForHostAsync(
-        begin,
-        end,
-        storage_origin, base::Bind(&OnClearedCookies, callback));
+    cookie_store->DeleteAllCreatedBetweenWithPredicateAsync(

[Mike West, 2016/04/01 07:40:52]

Why do we only clear host cookies here? I understand that it shouldn't be a
behavioral change, but I don't understand the current behavior.

[dmurph, 2016/04/01 23:16:45]

I have no idea. I suspect that we might be able to get rid of the host-specific
code path all together, but it's a little murky.

+        begin, end,
+        net::CookieStore::CreatePredicateForHostCookies(storage_origin),
+        base::Bind(&OnClearedCookies, callback));
   }
 }
 
 void CheckQuotaManagedDataDeletionStatus(size_t* deletion_task_count,
                                          const base::Closure& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (*deletion_task_count == 0) {
     delete deletion_task_count;
     callback.Run();
   }
@@ skipping 826 matching lines @@
     net::URLRequestContextGetter* url_request_context) {
   url_request_context_ = url_request_context;
 }
 
 void StoragePartitionImpl::SetMediaURLRequestContext(
     net::URLRequestContextGetter* media_url_request_context) {
   media_url_request_context_ = media_url_request_context;
 }
 
 }  // namespace content