| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h" | 5 #include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h" |
| 6 | 6 |
| 7 #include <stdint.h> |
| 8 |
| 7 #include <set> | 9 #include <set> |
| 8 #include <string> | 10 #include <string> |
| 9 #include <utility> | 11 #include <utility> |
| 10 | 12 |
| 11 #include "base/callback.h" | 13 #include "base/callback.h" |
| 12 #include "base/metrics/user_metrics.h" | 14 #include "base/metrics/user_metrics.h" |
| 13 #include "chrome/browser/autofill/personal_data_manager_factory.h" | 15 #include "chrome/browser/autofill/personal_data_manager_factory.h" |
| 14 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 16 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
| 15 #include "chrome/browser/browser_process.h" | 17 #include "chrome/browser/browser_process.h" |
| 16 #include "chrome/browser/browsing_data/browsing_data_helper.h" | 18 #include "chrome/browser/browsing_data/browsing_data_helper.h" |
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 185 } | 187 } |
| 186 #endif | 188 #endif |
| 187 | 189 |
| 188 void ClearCookiesOnIOThread(base::Time delete_begin, | 190 void ClearCookiesOnIOThread(base::Time delete_begin, |
| 189 base::Time delete_end, | 191 base::Time delete_end, |
| 190 net::URLRequestContextGetter* rq_context, | 192 net::URLRequestContextGetter* rq_context, |
| 191 const base::Closure& callback) { | 193 const base::Closure& callback) { |
| 192 DCHECK_CURRENTLY_ON(BrowserThread::IO); | 194 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
| 193 net::CookieStore* cookie_store = | 195 net::CookieStore* cookie_store = |
| 194 rq_context->GetURLRequestContext()->cookie_store(); | 196 rq_context->GetURLRequestContext()->cookie_store(); |
| 195 cookie_store->DeleteAllCreatedBetweenAsync(delete_begin, delete_end, | 197 cookie_store->DeleteAllCreatedBetweenAsync( |
| 196 IgnoreArgument<int>(callback)); | 198 delete_begin, delete_end, IgnoreArgument<uint32_t>(callback)); |
| 197 } | 199 } |
| 198 | 200 |
| 199 void ClearCookiesWithPredicateOnIOThread( | 201 void ClearCookiesWithPredicateOnIOThread( |
| 200 base::Time delete_begin, | 202 base::Time delete_begin, |
| 201 base::Time delete_end, | 203 base::Time delete_end, |
| 202 net::CookieStore::CookiePredicate predicate, | 204 net::CookieStore::CookiePredicate predicate, |
| 203 net::URLRequestContextGetter* rq_context, | 205 net::URLRequestContextGetter* rq_context, |
| 204 const base::Closure& callback) { | 206 const base::Closure& callback) { |
| 205 DCHECK_CURRENTLY_ON(BrowserThread::IO); | 207 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
| 206 net::CookieStore* cookie_store = | 208 net::CookieStore* cookie_store = |
| 207 rq_context->GetURLRequestContext()->cookie_store(); | 209 rq_context->GetURLRequestContext()->cookie_store(); |
| 208 cookie_store->DeleteAllCreatedBetweenWithPredicateAsync( | 210 cookie_store->DeleteAllCreatedBetweenWithPredicateAsync( |
| 209 delete_begin, delete_end, predicate, IgnoreArgument<int>(callback)); | 211 delete_begin, delete_end, predicate, IgnoreArgument<uint32_t>(callback)); |
| 210 } | 212 } |
| 211 | 213 |
| 212 void ClearNetworkPredictorOnIOThread(chrome_browser_net::Predictor* predictor) { | 214 void ClearNetworkPredictorOnIOThread(chrome_browser_net::Predictor* predictor) { |
| 213 DCHECK_CURRENTLY_ON(BrowserThread::IO); | 215 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
| 214 DCHECK(predictor); | 216 DCHECK(predictor); |
| 215 | 217 |
| 216 predictor->DiscardInitialNavigationHistory(); | 218 predictor->DiscardInitialNavigationHistory(); |
| 217 predictor->DiscardAllResults(); | 219 predictor->DiscardAllResults(); |
| 218 } | 220 } |
| 219 | 221 |
| (...skipping 974 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1194 } | 1196 } |
| 1195 | 1197 |
| 1196 void ChromeBrowsingDataRemoverDelegate:: | 1198 void ChromeBrowsingDataRemoverDelegate:: |
| 1197 OnDeauthorizeFlashContentLicensesCompleted( | 1199 OnDeauthorizeFlashContentLicensesCompleted( |
| 1198 uint32_t request_id, | 1200 uint32_t request_id, |
| 1199 bool /* success */) { | 1201 bool /* success */) { |
| 1200 DCHECK_EQ(request_id, deauthorize_flash_content_licenses_request_id_); | 1202 DCHECK_EQ(request_id, deauthorize_flash_content_licenses_request_id_); |
| 1201 clear_flash_content_licenses_.GetCompletionCallback().Run(); | 1203 clear_flash_content_licenses_.GetCompletionCallback().Run(); |
| 1202 } | 1204 } |
| 1203 #endif | 1205 #endif |
| OLD | NEW |