diff options
Diffstat (limited to 'chrome/browser/browsing_data_remover.cc')
| -rw-r--r-- | chrome/browser/browsing_data_remover.cc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/chrome/browser/browsing_data_remover.cc b/chrome/browser/browsing_data_remover.cc index baaf258..cc9b69c 100644 --- a/chrome/browser/browsing_data_remover.cc +++ b/chrome/browser/browsing_data_remover.cc @@ -104,7 +104,7 @@ BrowsingDataRemover::BrowsingDataRemover(Profile* profile, waiting_for_clear_cookies_count_(0), waiting_for_clear_history_(false), waiting_for_clear_networking_history_(false), - waiting_for_clear_origin_bound_certs_(false), + waiting_for_clear_server_bound_certs_(false), waiting_for_clear_plugin_data_(false), waiting_for_clear_quota_managed_data_(false), remove_mask_(0), @@ -129,7 +129,7 @@ BrowsingDataRemover::BrowsingDataRemover(Profile* profile, waiting_for_clear_cookies_count_(0), waiting_for_clear_history_(false), waiting_for_clear_networking_history_(false), - waiting_for_clear_origin_bound_certs_(false), + waiting_for_clear_server_bound_certs_(false), waiting_for_clear_plugin_data_(false), waiting_for_clear_quota_managed_data_(false), remove_mask_(0), @@ -288,16 +288,16 @@ void BrowsingDataRemover::RemoveImpl(int remove_mask, #endif } - if (remove_mask & REMOVE_ORIGIN_BOUND_CERTS) { + if (remove_mask & REMOVE_SERVER_BOUND_CERTS) { content::RecordAction( - UserMetricsAction("ClearBrowsingData_OriginBoundCerts")); + UserMetricsAction("ClearBrowsingData_ServerBoundCerts")); // Since we are running on the UI thread don't call GetURLRequestContext(). net::URLRequestContextGetter* rq_context = profile_->GetRequestContext(); if (rq_context) { - waiting_for_clear_origin_bound_certs_ = true; + waiting_for_clear_server_bound_certs_ = true; BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, - base::Bind(&BrowsingDataRemover::ClearOriginBoundCertsOnIOThread, + base::Bind(&BrowsingDataRemover::ClearServerBoundCertsOnIOThread, base::Unretained(this), base::Unretained(rq_context))); } } @@ -692,21 +692,21 @@ void BrowsingDataRemover::ClearCookiesOnIOThread( base::Unretained(this))); } -void BrowsingDataRemover::ClearOriginBoundCertsOnIOThread( +void BrowsingDataRemover::ClearServerBoundCertsOnIOThread( net::URLRequestContextGetter* rq_context) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); - net::OriginBoundCertService* origin_bound_cert_service = - rq_context->GetURLRequestContext()->origin_bound_cert_service(); - origin_bound_cert_service->GetCertStore()->DeleteAllCreatedBetween( + net::ServerBoundCertService* server_bound_cert_service = + rq_context->GetURLRequestContext()->server_bound_cert_service(); + server_bound_cert_service->GetCertStore()->DeleteAllCreatedBetween( delete_begin_, delete_end_); BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, - base::Bind(&BrowsingDataRemover::OnClearedOriginBoundCerts, + base::Bind(&BrowsingDataRemover::OnClearedServerBoundCerts, base::Unretained(this))); } -void BrowsingDataRemover::OnClearedOriginBoundCerts() { +void BrowsingDataRemover::OnClearedServerBoundCerts() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - waiting_for_clear_origin_bound_certs_ = false; + waiting_for_clear_server_bound_certs_ = false; NotifyAndDeleteIfDone(); } |