| Index: chrome/browser/browsing_data_remover.h
|
| diff --git a/chrome/browser/browsing_data_remover.h b/chrome/browser/browsing_data_remover.h
|
| index b54ef0326166109a83e7967f7e89d2a7e85ad606..8c60ee4ee30a1a5225c07c5f9e99b2e3b23228f8 100644
|
| --- a/chrome/browser/browsing_data_remover.h
|
| +++ b/chrome/browser/browsing_data_remover.h
|
| @@ -72,14 +72,14 @@ class BrowsingDataRemover : public content::NotificationObserver,
|
| REMOVE_PLUGIN_DATA = 1 << 9,
|
| REMOVE_PASSWORDS = 1 << 10,
|
| REMOVE_WEBSQL = 1 << 11,
|
| - REMOVE_ORIGIN_BOUND_CERTS = 1 << 12,
|
| + REMOVE_DOMAIN_BOUND_CERTS = 1 << 12,
|
|
|
| // "Site data" includes cookies, appcache, file systems, indexedDBs, local
|
| // storage, webSQL, and plugin data.
|
| REMOVE_SITE_DATA = REMOVE_APPCACHE | REMOVE_COOKIES | REMOVE_FILE_SYSTEMS |
|
| REMOVE_INDEXEDDB | REMOVE_LOCAL_STORAGE |
|
| REMOVE_PLUGIN_DATA | REMOVE_WEBSQL |
|
| - REMOVE_ORIGIN_BOUND_CERTS
|
| + REMOVE_DOMAIN_BOUND_CERTS
|
| };
|
|
|
| // When BrowsingDataRemover successfully removes data, a notification of type
|
| @@ -235,13 +235,13 @@ class BrowsingDataRemover : public content::NotificationObserver,
|
| // Invoked on the IO thread to delete cookies.
|
| void ClearCookiesOnIOThread(net::URLRequestContextGetter* rq_context);
|
|
|
| - // Invoked on the IO thread to delete origin bound certs.
|
| - void ClearOriginBoundCertsOnIOThread(
|
| + // Invoked on the IO thread to delete domain bound certs.
|
| + void ClearDomainBoundCertsOnIOThread(
|
| net::URLRequestContextGetter* rq_context);
|
|
|
| - // Callback when origin bound certs have been deleted. Invokes
|
| + // Callback when domain bound certs have been deleted. Invokes
|
| // NotifyAndDeleteIfDone.
|
| - void OnClearedOriginBoundCerts();
|
| + void OnClearedDomainBoundCerts();
|
|
|
| // Calculate the begin time for the deletion range specified by |time_period|.
|
| base::Time CalculateBeginDeleteTime(TimePeriod time_period);
|
| @@ -256,7 +256,7 @@ class BrowsingDataRemover : public content::NotificationObserver,
|
| !waiting_for_clear_cookies_count_&&
|
| !waiting_for_clear_history_ &&
|
| !waiting_for_clear_networking_history_ &&
|
| - !waiting_for_clear_origin_bound_certs_ &&
|
| + !waiting_for_clear_domain_bound_certs_ &&
|
| !waiting_for_clear_plugin_data_ &&
|
| !waiting_for_clear_quota_managed_data_;
|
| }
|
| @@ -304,7 +304,7 @@ class BrowsingDataRemover : public content::NotificationObserver,
|
| int waiting_for_clear_cookies_count_;
|
| bool waiting_for_clear_history_;
|
| bool waiting_for_clear_networking_history_;
|
| - bool waiting_for_clear_origin_bound_certs_;
|
| + bool waiting_for_clear_domain_bound_certs_;
|
| bool waiting_for_clear_plugin_data_;
|
| bool waiting_for_clear_quota_managed_data_;
|
|
|
|
|