| Index: content/browser/tab_contents/tab_contents.cc
|
| diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc
|
| index b14a4cc6bb49f2c6c1741bf15e495c018a3cc6e8..57b54327a08e7d7b48fd84658dca6aa5acee9da6 100644
|
| --- a/content/browser/tab_contents/tab_contents.cc
|
| +++ b/content/browser/tab_contents/tab_contents.cc
|
| @@ -599,10 +599,8 @@ bool TabContents::NavigateToEntry(
|
| void TabContents::SetHistoryLengthAndPrune(const SiteInstance* site_instance,
|
| int history_length,
|
| int32 minimum_page_id) {
|
| - // SetHistoryLengthAndPrune doesn't handle pending cross-site navigations
|
| - // cleanly. Since it's only used when swapping in instant and prerendered
|
| - // TabContents, checks are done at a higher level to ensure that the pages
|
| - // are not swapped in during this case.
|
| + // SetHistoryLengthAndPrune doesn't work when there are pending cross-site
|
| + // navigations. Callers should ensure that this is the case.
|
| if (render_manager_.pending_render_view_host()) {
|
| NOTREACHED();
|
| return;
|
|
|