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

ios/chrome/browser/browsing_data/ios_chrome_browsing_data_remover.mm

 // Copyright 2015 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 "ios/chrome/browser/browsing_data/ios_chrome_browsing_data_remover.h"
 
 #include <map>
 #include <set>
 #include <string>
 
@@ skipping 20 matching lines @@
 #include "ios/chrome/browser/ios_chrome_io_thread.h"
 #include "ios/chrome/browser/passwords/ios_chrome_password_store_factory.h"
 #include "ios/chrome/browser/search_engines/template_url_service_factory.h"
 #include "ios/chrome/browser/sessions/ios_chrome_tab_restore_service_factory.h"
 #include "ios/chrome/browser/web_data_service_factory.h"
 #include "ios/net/http_cache_helper.h"
 #include "ios/public/provider/chrome/browser/chrome_browser_provider.h"
 #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"
 #include "net/cookies/cookie_store.h"
 #include "net/http/transport_security_state.h"
 #include "net/ssl/channel_id_service.h"
 #include "net/ssl/channel_id_store.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 
 using base::UserMetricsAction;
 using web::WebThread;
 
 namespace {
 
 using CallbackList = base::CallbackList<void(
     const IOSChromeBrowsingDataRemover::NotificationDetails&)>;
 
 // Contains all registered callbacks for browsing data removed notifications.
 CallbackList* g_on_browsing_data_removed_callbacks = nullptr;
 
 // Accessor for |*g_on_browsing_data_removed_callbacks|. Creates a new object
 // the first time so that it always returns a valid object.
 CallbackList* GetOnBrowsingDataRemovedCallbacks() {
   if (!g_on_browsing_data_removed_callbacks)
     g_on_browsing_data_removed_callbacks = new CallbackList();
   return g_on_browsing_data_removed_callbacks;
 }
 
+bool DoesCookieMatchHost(const std::string& host,
+                         const net::CanonicalCookie& cookie) {
+  return cookie.IsHostCookie() && cookie.IsDomainMatch(host);
+}
+
 }  // namespace
 
 bool IOSChromeBrowsingDataRemover::is_removing_ = false;
 
 IOSChromeBrowsingDataRemover::NotificationDetails::NotificationDetails()
     : removal_begin(base::Time()), removal_mask(-1) {}
 
 IOSChromeBrowsingDataRemover::NotificationDetails::NotificationDetails(
     const IOSChromeBrowsingDataRemover::NotificationDetails& details)
     : removal_begin(details.removal_begin),
@@ skipping 398 matching lines @@
     const GURL& storage_url) {
   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,
+    cookie_store->DeleteAllCreatedBetweenWithPredicateAsync(
+        delete_begin_, delete_end_,
+        base::Bind(&DoesCookieMatchHost, storage_url.host()),
         base::Bind(&IOSChromeBrowsingDataRemover::OnClearedCookies,
                    base::Unretained(this)));
   }
 }
 
 void IOSChromeBrowsingDataRemover::ClearChannelIDsOnIOThread(
     const scoped_refptr<net::URLRequestContextGetter>& rq_context) {
   DCHECK_CURRENTLY_ON(WebThread::IO);
   net::ChannelIDService* channel_id_service =
       rq_context->GetURLRequestContext()->channel_id_service();
@@ skipping 35 matching lines @@
   waiting_for_clear_autofill_origin_urls_ = false;
   NotifyAndDeleteIfDone();
 }
 
 // static
 IOSChromeBrowsingDataRemover::CallbackSubscription
 IOSChromeBrowsingDataRemover::RegisterOnBrowsingDataRemovedCallback(
     const IOSChromeBrowsingDataRemover::Callback& callback) {
   return GetOnBrowsingDataRemovedCallbacks()->Add(callback);
 }