| Index: chrome/browser/dom_ui/history_ui.cc
|
| diff --git a/chrome/browser/dom_ui/history_ui.cc b/chrome/browser/dom_ui/history_ui.cc
|
| index 45a994b97a1c42c8fccb5f7d4de1e0b8c825abbf..978ad0749af84402e0e3546852aa17e20b29641d 100644
|
| --- a/chrome/browser/dom_ui/history_ui.cc
|
| +++ b/chrome/browser/dom_ui/history_ui.cc
|
| @@ -104,7 +104,7 @@ BrowsingHistoryHandler::BrowsingHistoryHandler()
|
|
|
| BrowsingHistoryHandler::~BrowsingHistoryHandler() {
|
| cancelable_consumer_.CancelAllRequests();
|
| - if (remover_.get())
|
| + if (remover_)
|
| remover_->RemoveObserver(this);
|
| }
|
|
|
| @@ -204,9 +204,9 @@ void BrowsingHistoryHandler::HandleDeleteDay(const Value* value) {
|
| base::Time begin_time = time.LocalMidnight();
|
| base::Time end_time = begin_time + base::TimeDelta::FromDays(1);
|
|
|
| - remover_.reset(new BrowsingDataRemover(dom_ui_->GetProfile(),
|
| - begin_time,
|
| - end_time));
|
| + remover_ = new BrowsingDataRemover(dom_ui_->GetProfile(),
|
| + begin_time,
|
| + end_time);
|
| remover_->AddObserver(this);
|
| remover_->Remove(BrowsingDataRemover::REMOVE_HISTORY |
|
| BrowsingDataRemover::REMOVE_COOKIES |
|
| @@ -215,8 +215,9 @@ void BrowsingHistoryHandler::HandleDeleteDay(const Value* value) {
|
|
|
| void BrowsingHistoryHandler::OnBrowsingDataRemoverDone() {
|
| dom_ui_->CallJavascriptFunction(L"deleteComplete");
|
| - remover_->RemoveObserver(this);
|
| - remover_.release();
|
| + // No need to remove ourselves as an observer as BrowsingDataRemover deletes
|
| + // itself after we return.
|
| + remover_ = NULL;
|
| }
|
|
|
| void BrowsingHistoryHandler::QueryComplete(
|
|
|