[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"

[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"
 #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;
 
@@ skipping 68 matching lines @@
   DCHECK(AllDone());
 }
 
 // Static.
 void IOSChromeBrowsingDataRemover::set_removing(bool is_removing) {
   DCHECK(is_removing_ != is_removing);
   is_removing_ = 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;
 
   // On other platforms, it is possible to specify different types of origins
   // to clear data for (e.g., unprotected web vs. extensions). On iOS, this
   // mask is always implicitly the unprotected web, which is the only type that
   // is relevant. This metric is left here for historical consistency.
   web::RecordAction(
       UserMetricsAction("ClearBrowsingData_MaskContainsUnprotectedWeb"));
 
   if (remove_mask & REMOVE_HISTORY) {
     history::HistoryService* history_service =
         ios::HistoryServiceFactory::GetForBrowserState(
             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;
 
       history_service->ExpireLocalAndRemoteHistoryBetween(
           ios::WebHistoryServiceFactory::GetForBrowserState(browser_state_),
           restrict_urls, delete_begin_, delete_end_,
           base::Bind(&IOSChromeBrowsingDataRemover::OnHistoryDeletionDone,
                      base::Unretained(this)),
           &history_task_tracker_);
     }
@@ skipping 21 matching lines @@
       TemplateURLService* keywords_model =
           ios::TemplateURLServiceFactory::GetForBrowserState(browser_state_);
       if (keywords_model && !keywords_model->loaded()) {
         template_url_sub_ = keywords_model->RegisterOnLoadedCallback(
             base::Bind(&IOSChromeBrowsingDataRemover::OnKeywordsLoaded,
                        base::Unretained(this)));
         keywords_model->Load();
         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
     // which these profiles and credit cards were learned.  These are a form of
     // history, so clear them as well.
     scoped_refptr<autofill::AutofillWebDataService> web_data_service =
         ios::WebDataServiceFactory::GetAutofillWebDataForBrowserState(
             browser_state_, ServiceAccessType::EXPLICIT_ACCESS);
     if (web_data_service.get()) {
       waiting_for_clear_autofill_origin_urls_ = true;
@@ skipping 23 matching lines @@
     // any user action.
     if (delete_begin_ == base::Time()) {
       scoped_refptr<net::URLRequestContextGetter> safe_browsing_context =
           make_scoped_refptr(ios::GetChromeBrowserProvider()
                                  ->GetSafeBrowsingURLRequestContext());
       if (safe_browsing_context) {
         ++waiting_for_clear_cookies_count_;
         WebThread::PostTask(
             WebThread::IO, FROM_HERE,
             base::Bind(&IOSChromeBrowsingDataRemover::ClearCookiesOnIOThread,
-                       base::Unretained(this), safe_browsing_context, GURL()));
+                       base::Unretained(this), safe_browsing_context));
       }
     }
 
     ++waiting_for_clear_cookies_count_;
     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.
   }
 
   if (remove_mask & REMOVE_CHANNEL_IDS) {
     web::RecordAction(UserMetricsAction("ClearBrowsingData_ChannelIDs"));
     if (main_context_getter_) {
       waiting_for_clear_channel_ids_ = true;
       WebThread::PostTask(
@@ skipping 193 matching lines @@
                    base::Unretained(this), num_deleted));
     return;
   }
 
   DCHECK_GT(waiting_for_clear_cookies_count_, 0);
   --waiting_for_clear_cookies_count_;
   NotifyAndDeleteIfDone();
 }
 
 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(
     const scoped_refptr<net::URLRequestContextGetter>& rq_context) {
   DCHECK_CURRENTLY_ON(WebThread::IO);
   net::ChannelIDService* channel_id_service =
       rq_context->GetURLRequestContext()->channel_id_service();
   channel_id_service->GetChannelIDStore()->DeleteAllCreatedBetween(
       delete_begin_, delete_end_,
       base::Bind(&IOSChromeBrowsingDataRemover::OnClearedChannelIDsOnIOThread,
@@ skipping 32 matching lines @@
   waiting_for_clear_autofill_origin_urls_ = false;
   NotifyAndDeleteIfDone();
 }
 
 // static
 IOSChromeBrowsingDataRemover::CallbackSubscription
 IOSChromeBrowsingDataRemover::RegisterOnBrowsingDataRemovedCallback(
     const IOSChromeBrowsingDataRemover::Callback& callback) {
   return GetOnBrowsingDataRemovedCallbacks()->Add(callback);
 }