| Index: chrome/browser/browsing_data/browsing_data_remover.h
|
| diff --git a/chrome/browser/browsing_data/browsing_data_remover.h b/chrome/browser/browsing_data/browsing_data_remover.h
|
| index 87d305bff6c5ccbf915b5acac313b26f0439184a..580007f1efac436191078dde54b6a45cc8819c0a 100644
|
| --- a/chrome/browser/browsing_data/browsing_data_remover.h
|
| +++ b/chrome/browser/browsing_data/browsing_data_remover.h
|
| @@ -225,13 +225,24 @@ class BrowsingDataRemover : public content::NotificationObserver,
|
| // object.
|
| void NotifyAndDeleteIfDone();
|
|
|
| - // Callback when the network history has been deleted. Invokes
|
| - // NotifyAndDeleteIfDone.
|
| - void ClearedNetworkHistory();
|
| + // Callback when the hostname resolution cache has been cleared.
|
| + // Clears the respective waiting flag and invokes NotifyAndDeleteIfDone.
|
| + void OnClearedHostnameResolutionCache();
|
| +
|
| + // Invoked on the IO thread to clear the hostname resolution cache.
|
| + void ClearHostnameResolutionCacheOnIOThread(IOThread* io_thread);
|
| +
|
| + // Callback when speculative data in the network Predictor has been cleared.
|
| + // Clears the respective waiting flag and invokes NotifyAndDeleteIfDone.
|
| + void OnClearedNetworkPredictor();
|
| +
|
| + // Invoked on the IO thread to clear speculative data related to hostname
|
| + // pre-resolution from the network Predictor.
|
| + void ClearNetworkPredictorOnIOThread();
|
|
|
| - // Invoked on the IO thread to clear the HostCache, speculative data about
|
| - // subresources on visited sites, and initial navigation history.
|
| - void ClearNetworkingHistory(IOThread* io_thread);
|
| + // Callback when network related data in ProfileIOData has been cleared.
|
| + // Clears the respective waiting flag and invokes NotifyAndDeleteIfDone.
|
| + void OnClearedNetworkingHistory();
|
|
|
| // Callback when the cache has been deleted. Invokes NotifyAndDeleteIfDone.
|
| void ClearedCache();
|
| @@ -360,18 +371,20 @@ class BrowsingDataRemover : public content::NotificationObserver,
|
| // True if we're waiting for various data to be deleted.
|
| // These may only be accessed from UI thread in order to avoid races!
|
| bool waiting_for_clear_cache_;
|
| - bool waiting_for_clear_nacl_cache_;
|
| + bool waiting_for_clear_content_licenses_;
|
| // Non-zero if waiting for cookies to be cleared.
|
| int waiting_for_clear_cookies_count_;
|
| + bool waiting_for_clear_form_;
|
| bool waiting_for_clear_history_;
|
| + bool waiting_for_clear_hostname_resolution_cache_;
|
| bool waiting_for_clear_local_storage_;
|
| - bool waiting_for_clear_session_storage_;
|
| + bool waiting_for_clear_nacl_cache_;
|
| + bool waiting_for_clear_network_predictor_;
|
| bool waiting_for_clear_networking_history_;
|
| - bool waiting_for_clear_server_bound_certs_;
|
| bool waiting_for_clear_plugin_data_;
|
| bool waiting_for_clear_quota_managed_data_;
|
| - bool waiting_for_clear_content_licenses_;
|
| - bool waiting_for_clear_form_;
|
| + bool waiting_for_clear_server_bound_certs_;
|
| + bool waiting_for_clear_session_storage_;
|
|
|
| // Tracking how many origins need to be deleted, and whether we're finished
|
| // gathering origins.
|
|
|