Index: chrome/browser/browsing_data_remover.cc |
diff --git a/chrome/browser/browsing_data_remover.cc b/chrome/browser/browsing_data_remover.cc |
index 83884746a8329034e4b587cdb8de1cf6a1d903a5..d92d83ffa0880cd971b6c22e16681040bb9e38a5 100644 |
--- a/chrome/browser/browsing_data_remover.cc |
+++ b/chrome/browser/browsing_data_remover.cc |
@@ -103,7 +103,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_domain_bound_certs_(false), |
waiting_for_clear_plugin_data_(false), |
waiting_for_clear_quota_managed_data_(false), |
remove_mask_(0), |
@@ -128,7 +128,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_domain_bound_certs_(false), |
waiting_for_clear_plugin_data_(false), |
waiting_for_clear_quota_managed_data_(false), |
remove_mask_(0), |
@@ -287,16 +287,16 @@ void BrowsingDataRemover::RemoveImpl(int remove_mask, |
#endif |
} |
- if (remove_mask & REMOVE_ORIGIN_BOUND_CERTS) { |
+ if (remove_mask & REMOVE_DOMAIN_BOUND_CERTS) { |
content::RecordAction( |
- UserMetricsAction("ClearBrowsingData_OriginBoundCerts")); |
+ UserMetricsAction("ClearBrowsingData_DomainBoundCerts")); |
// 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_domain_bound_certs_ = true; |
BrowserThread::PostTask( |
BrowserThread::IO, FROM_HERE, |
- base::Bind(&BrowsingDataRemover::ClearOriginBoundCertsOnIOThread, |
+ base::Bind(&BrowsingDataRemover::ClearDomainBoundCertsOnIOThread, |
base::Unretained(this), base::Unretained(rq_context))); |
} |
} |
@@ -717,7 +717,7 @@ void BrowsingDataRemover::ClearCookiesOnIOThread( |
base::Unretained(this))); |
} |
-void BrowsingDataRemover::ClearOriginBoundCertsOnIOThread( |
+void BrowsingDataRemover::ClearDomainBoundCertsOnIOThread( |
net::URLRequestContextGetter* rq_context) { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
net::OriginBoundCertService* origin_bound_cert_service = |
Mike West
2012/03/07 10:31:47
domain_bound_cert_service?
|
@@ -726,12 +726,12 @@ void BrowsingDataRemover::ClearOriginBoundCertsOnIOThread( |
delete_begin_, delete_end_); |
BrowserThread::PostTask( |
BrowserThread::UI, FROM_HERE, |
- base::Bind(&BrowsingDataRemover::OnClearedOriginBoundCerts, |
+ base::Bind(&BrowsingDataRemover::OnClearedDomainBoundCerts, |
base::Unretained(this))); |
} |
-void BrowsingDataRemover::OnClearedOriginBoundCerts() { |
+void BrowsingDataRemover::OnClearedDomainBoundCerts() { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
- waiting_for_clear_origin_bound_certs_ = false; |
+ waiting_for_clear_domain_bound_certs_ = false; |
NotifyAndDeleteIfDone(); |
} |