OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/browsing_data_remover.h" | 5 #include "chrome/browser/browsing_data/browsing_data_remover.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <set> | 8 #include <set> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
66 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h" | 66 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h" |
67 #include "components/nacl/browser/nacl_browser.h" | 67 #include "components/nacl/browser/nacl_browser.h" |
68 #include "components/nacl/browser/pnacl_host.h" | 68 #include "components/nacl/browser/pnacl_host.h" |
69 #include "content/public/browser/browser_thread.h" | 69 #include "content/public/browser/browser_thread.h" |
70 #include "content/public/browser/dom_storage_context.h" | 70 #include "content/public/browser/dom_storage_context.h" |
71 #include "content/public/browser/download_manager.h" | 71 #include "content/public/browser/download_manager.h" |
72 #include "content/public/browser/local_storage_usage_info.h" | 72 #include "content/public/browser/local_storage_usage_info.h" |
73 #include "content/public/browser/notification_service.h" | 73 #include "content/public/browser/notification_service.h" |
74 #include "content/public/browser/plugin_data_remover.h" | 74 #include "content/public/browser/plugin_data_remover.h" |
75 #include "content/public/browser/session_storage_usage_info.h" | 75 #include "content/public/browser/session_storage_usage_info.h" |
76 #include "content/public/browser/ssl_host_state_decisions.h" | |
76 #include "content/public/browser/storage_partition.h" | 77 #include "content/public/browser/storage_partition.h" |
77 #include "content/public/browser/user_metrics.h" | 78 #include "content/public/browser/user_metrics.h" |
78 #include "net/base/net_errors.h" | 79 #include "net/base/net_errors.h" |
79 #include "net/base/sdch_manager.h" | 80 #include "net/base/sdch_manager.h" |
80 #include "net/cookies/cookie_store.h" | 81 #include "net/cookies/cookie_store.h" |
81 #include "net/disk_cache/disk_cache.h" | 82 #include "net/disk_cache/disk_cache.h" |
82 #include "net/http/http_cache.h" | 83 #include "net/http/http_cache.h" |
83 #include "net/http/transport_security_state.h" | 84 #include "net/http/transport_security_state.h" |
84 #include "net/ssl/server_bound_cert_service.h" | 85 #include "net/ssl/server_bound_cert_service.h" |
85 #include "net/ssl/server_bound_cert_store.h" | 86 #include "net/ssl/server_bound_cert_store.h" |
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
394 BrowserThread::PostTaskAndReply( | 395 BrowserThread::PostTaskAndReply( |
395 BrowserThread::FILE, | 396 BrowserThread::FILE, |
396 FROM_HERE, | 397 FROM_HERE, |
397 base::Bind( | 398 base::Bind( |
398 &WebRtcLogUtil::DeleteOldAndRecentWebRtcLogFiles, | 399 &WebRtcLogUtil::DeleteOldAndRecentWebRtcLogFiles, |
399 WebRtcLogList::GetWebRtcLogDirectoryForProfile(profile_->GetPath()), | 400 WebRtcLogList::GetWebRtcLogDirectoryForProfile(profile_->GetPath()), |
400 delete_begin_), | 401 delete_begin_), |
401 base::Bind(&BrowsingDataRemover::OnClearedWebRtcLogs, | 402 base::Bind(&BrowsingDataRemover::OnClearedWebRtcLogs, |
402 base::Unretained(this))); | 403 base::Unretained(this))); |
403 #endif | 404 #endif |
405 | |
406 // The SSL Host State that tracks SSL interstitial "proceed" decisions may | |
407 // include origins that the user has visited, so it must be cleared. | |
408 if (profile_->GetSSLHostStateDecisions()) | |
409 profile_->GetSSLHostStateDecisions()->Clear(); | |
felt
2014/07/07 22:26:39
when this is called in Incognito, I assume this ju
jww
2014/07/08 17:35:41
Correct. I've updated the browser tests in chrome_
| |
404 } | 410 } |
405 | 411 |
406 if ((remove_mask & REMOVE_DOWNLOADS) && may_delete_history) { | 412 if ((remove_mask & REMOVE_DOWNLOADS) && may_delete_history) { |
407 content::RecordAction(UserMetricsAction("ClearBrowsingData_Downloads")); | 413 content::RecordAction(UserMetricsAction("ClearBrowsingData_Downloads")); |
408 content::DownloadManager* download_manager = | 414 content::DownloadManager* download_manager = |
409 BrowserContext::GetDownloadManager(profile_); | 415 BrowserContext::GetDownloadManager(profile_); |
410 download_manager->RemoveDownloadsBetween(delete_begin_, delete_end_); | 416 download_manager->RemoveDownloadsBetween(delete_begin_, delete_end_); |
411 DownloadPrefs* download_prefs = DownloadPrefs::FromDownloadManager( | 417 DownloadPrefs* download_prefs = DownloadPrefs::FromDownloadManager( |
412 download_manager); | 418 download_manager); |
413 download_prefs->SetSaveFilePath(download_prefs->DownloadPath()); | 419 download_prefs->SetSaveFilePath(download_prefs->DownloadPath()); |
(...skipping 749 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1163 waiting_for_clear_webrtc_logs_ = false; | 1169 waiting_for_clear_webrtc_logs_ = false; |
1164 NotifyAndDeleteIfDone(); | 1170 NotifyAndDeleteIfDone(); |
1165 } | 1171 } |
1166 #endif | 1172 #endif |
1167 | 1173 |
1168 void BrowsingDataRemover::OnClearedDomainReliabilityMonitor() { | 1174 void BrowsingDataRemover::OnClearedDomainReliabilityMonitor() { |
1169 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 1175 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
1170 waiting_for_clear_domain_reliability_monitor_ = false; | 1176 waiting_for_clear_domain_reliability_monitor_ = false; |
1171 NotifyAndDeleteIfDone(); | 1177 NotifyAndDeleteIfDone(); |
1172 } | 1178 } |
OLD | NEW |