diff options
| -rw-r--r-- | chrome/browser/browsing_data/browsing_data_remover.cc | 12 | ||||
| -rw-r--r-- | chrome/browser/history/history_backend.cc | 3 |
2 files changed, 3 insertions, 12 deletions
diff --git a/chrome/browser/browsing_data/browsing_data_remover.cc b/chrome/browser/browsing_data/browsing_data_remover.cc index 7484536..28c2557 100644 --- a/chrome/browser/browsing_data/browsing_data_remover.cc +++ b/chrome/browser/browsing_data/browsing_data_remover.cc @@ -238,18 +238,8 @@ void BrowsingDataRemover::RemoveImpl(int remove_mask, content::RecordAction(UserMetricsAction("ClearBrowsingData_History")); waiting_for_clear_history_ = true; - // The HistoryService special-cases an end time of base::Time() to - // efficiently remove the whole history database. Support that here by - // passing base::Time() into HistoryService::ExpireHistoryBetween rather - // than base::Time::Max(). - // - // TODO(sky?): Adjust HistoryService so that it understands Time::Max() - // and deals well with non-max/non-null time periods: see - // http://crbug.com/145680 for details. - base::Time history_end_ = delete_end_ == base::Time::Max() ? - base::Time() : delete_end_; history_service->ExpireLocalAndRemoteHistoryBetween( - restrict_urls, delete_begin_, history_end_, + restrict_urls, delete_begin_, delete_end_, base::Bind(&BrowsingDataRemover::OnHistoryDeletionDone, base::Unretained(this)), &history_task_tracker_); diff --git a/chrome/browser/history/history_backend.cc b/chrome/browser/history/history_backend.cc index 95980cf..26a0d9d 100644 --- a/chrome/browser/history/history_backend.cc +++ b/chrome/browser/history/history_backend.cc @@ -2713,7 +2713,8 @@ void HistoryBackend::ExpireHistoryBetween( Time begin_time, Time end_time) { if (db_.get()) { - if (begin_time.is_null() && end_time.is_null() && restrict_urls.empty()) { + if (begin_time.is_null() && (end_time.is_null() || end_time.is_max()) && + restrict_urls.empty()) { // Special case deleting all history so it can be faster and to reduce the // possibility of an information leak. DeleteAllHistory(); |