Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1776)

Unified Diff: chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc

Issue 2617403005: Move HISTORY and PASSWORDS from BrowsingDataRemover to the delegate (Closed)
Patch Set: Rebase. Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
index 92fd6d60b85666d694b36e255b1834ee95a89db9..ac5a6495a83826b584354f30d5d14de0d917394e 100644
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
@@ -64,8 +64,11 @@
#include "components/previews/core/previews_ui_service.h"
#include "components/search_engines/template_url_service.h"
#include "components/sessions/core/tab_restore_service.h"
+#include "content/public/browser/ssl_host_state_delegate.h"
+#include "content/public/browser/storage_partition.h"
#include "content/public/browser/user_metrics.h"
#include "net/cookies/cookie_store.h"
+#include "net/http/http_transaction_factory.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_getter.h"
@@ -207,6 +210,20 @@ void ClearHostnameResolutionCacheOnIOThread(
io_thread->ClearHostCache(host_filter);
}
+void ClearHttpAuthCacheOnIOThread(
+ scoped_refptr<net::URLRequestContextGetter> context_getter,
+ base::Time delete_begin) {
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
+
+ net::HttpNetworkSession* http_session = context_getter->GetURLRequestContext()
+ ->http_transaction_factory()
+ ->GetSession();
+ DCHECK(http_session);
+ http_session->http_auth_cache()->ClearEntriesAddedWithin(base::Time::Now() -
+ delete_begin);
+ http_session->CloseAllConnections();
+}
+
} // namespace
ChromeBrowsingDataRemoverDelegate::SubTask::SubTask(
@@ -260,6 +277,7 @@ ChromeBrowsingDataRemoverDelegate::ChromeBrowsingDataRemoverDelegate(
clear_networking_history_(sub_task_forward_callback_),
clear_passwords_(sub_task_forward_callback_),
clear_passwords_stats_(sub_task_forward_callback_),
+ clear_http_auth_cache_(sub_task_forward_callback_),
clear_platform_keys_(sub_task_forward_callback_),
#if defined(OS_ANDROID)
clear_precache_history_(sub_task_forward_callback_),
@@ -309,6 +327,13 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
bool may_delete_history = prefs->GetBoolean(
prefs::kAllowDeletingBrowserHistory);
+ // All the UI entry points into the BrowsingDataRemoverImpl should be
+ // disabled, but this will fire if something was missed or added.
+ DCHECK(may_delete_history ||
+ (remove_mask & BrowsingDataRemover::REMOVE_NOCHECKS) ||
+ (!(remove_mask & BrowsingDataRemover::REMOVE_HISTORY) &&
+ !(remove_mask & BrowsingDataRemover::REMOVE_DOWNLOADS)));
+
//////////////////////////////////////////////////////////////////////////////
// REMOVE_HISTORY
if ((remove_mask & BrowsingDataRemover::REMOVE_HISTORY) &&
@@ -515,6 +540,18 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
previews_service->previews_ui_service()->ClearBlackList(delete_begin_,
delete_end_);
}
+
+ // The SSL Host State that tracks SSL interstitial "proceed" decisions may
+ // include origins that the user has visited, so it must be cleared.
+ // TODO(msramek): We can reuse the plugin filter here, since both plugins
+ // and SSL host state are scoped to hosts and represent them as std::string.
+ // Rename the method to indicate its more general usage.
+ if (profile_->GetSSLHostStateDelegate()) {
+ profile_->GetSSLHostStateDelegate()->Clear(
+ filter_builder.IsEmptyBlacklist()
+ ? base::Callback<bool(const std::string&)>()
+ : filter_builder.BuildPluginFilter());
+ }
}
//////////////////////////////////////////////////////////////////////////////
@@ -618,6 +655,16 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
filter, delete_begin_, delete_end_,
clear_passwords_.GetCompletionCallback());
}
+
+ scoped_refptr<net::URLRequestContextGetter> request_context =
+ BrowserContext::GetDefaultStoragePartition(profile_)
+ ->GetURLRequestContext();
+ clear_http_auth_cache_.Start();
+ BrowserThread::PostTaskAndReply(
+ BrowserThread::IO, FROM_HERE,
+ base::Bind(&ClearHttpAuthCacheOnIOThread, std::move(request_context),
+ delete_begin_),
+ clear_http_auth_cache_.GetCompletionCallback());
}
if (remove_mask & BrowsingDataRemover::REMOVE_COOKIES) {
@@ -847,6 +894,7 @@ bool ChromeBrowsingDataRemoverDelegate::AllDone() {
!clear_networking_history_.is_pending() &&
!clear_passwords_.is_pending() &&
!clear_passwords_stats_.is_pending() &&
+ !clear_http_auth_cache_.is_pending() &&
!clear_platform_keys_.is_pending() &&
#if defined(OS_ANDROID)
!clear_precache_history_.is_pending() &&
« no previous file with comments | « chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698