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..e193d4619ad78cccc12561dbfdff5f955bb236d6 100644 |
--- a/chrome/browser/prerender/prerender_manager.cc |
+++ b/chrome/browser/prerender/prerender_manager.cc |
@@ -521,7 +521,8 @@ void PrerenderManager::MoveEntryToPendingDelete(PrerenderContents* entry, |
FinalStatus final_status) { |
DCHECK(CalledOnValidThread()); |
DCHECK(entry); |
- DCHECK(!IsPendingDelete(entry)); |
+ DCHECK_EQ(0, std::count(pending_delete_list_.begin(), |
mmenke
2012/05/09 14:48:08
nit: Might be nice to have a comment here, too.
|
+ pending_delete_list_.end(), entry)); |
for (PrerenderContentsDataList::iterator it = prerender_list_.begin(); |
it != prerender_list_.end(); |
@@ -699,12 +700,6 @@ bool PrerenderManager::IsWebContentsPrerendering( |
return false; |
} |
-bool PrerenderManager::DidPrerenderFinishLoading(const GURL& url) const { |
- DCHECK(CalledOnValidThread()); |
- PrerenderContents* contents = FindEntry(url); |
- return contents ? contents->has_finished_loading() : false; |
-} |
- |
void PrerenderManager::MarkWebContentsAsPrerendered(WebContents* web_contents) { |
DCHECK(CalledOnValidThread()); |
prerendered_tab_contents_set_.insert(web_contents); |
@@ -1066,19 +1061,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(); |