| Index: chrome/browser/prerender/prerender_manager.cc
|
| diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc
|
| index b76dddae2f3fe59ab76c6131d24e02a59e0e93d8..3b65e64a770715d5749b6b2cf51561e3fc091f0b 100644
|
| --- a/chrome/browser/prerender/prerender_manager.cc
|
| +++ b/chrome/browser/prerender/prerender_manager.cc
|
| @@ -521,7 +521,9 @@ void PrerenderManager::MoveEntryToPendingDelete(PrerenderContents* entry,
|
| FinalStatus final_status) {
|
| DCHECK(CalledOnValidThread());
|
| DCHECK(entry);
|
| - DCHECK(!IsPendingDelete(entry));
|
| + // Confirm this entry has not already been moved to the pending delete list.
|
| + DCHECK_EQ(0, std::count(pending_delete_list_.begin(),
|
| + pending_delete_list_.end(), entry));
|
|
|
| for (PrerenderContentsDataList::iterator it = prerender_list_.begin();
|
| it != prerender_list_.end();
|
| @@ -1066,19 +1068,6 @@ PrerenderContents* PrerenderManager::CreatePrerenderContents(
|
| referrer, origin, experiment_id);
|
| }
|
|
|
| -bool PrerenderManager::IsPendingDelete(PrerenderContents* entry) const {
|
| - DCHECK(CalledOnValidThread());
|
| - for (std::list<PrerenderContents*>::const_iterator it =
|
| - pending_delete_list_.begin();
|
| - it != pending_delete_list_.end();
|
| - ++it) {
|
| - if (*it == entry)
|
| - return true;
|
| - }
|
| -
|
| - return false;
|
| -}
|
| -
|
| void PrerenderManager::DeletePendingDeleteEntries() {
|
| while (!pending_delete_list_.empty()) {
|
| PrerenderContents* contents = pending_delete_list_.front();
|
|
|