Remove references to prerender and instant in content.

These were introduced with the SetHistoryLengthAndPrune changes.


Review URL: http://codereview.chromium.org/7633071

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96939 0039d316-1c4b-4281-b951-d872f2087c98

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;

content/common/view_messages.h

@@ -748,16 +748,15 @@ IPC_STRUCT_END()
 IPC_MESSAGE_CONTROL1(ViewMsg_SetNextPageID,
                      int32 /* next_page_id */)
 
-// Sent to the RenderView when a prerendered or instant page is committed
-// to an existing tab. The existing tab has a history of
-// |merged_history_length| which precedes the current history of pages
-// in the render view. All page_ids >= |minimum_page_id| are appended to
-// this new history in the same order.
+// Sent to the RenderView when a new tab is swapped into an existing
+// tab and the histories need to be merged. The existing tab has a history of
+// |merged_history_length| which precedes the history of the new tab. All
+// page_ids >= |minimum_page_id| in the new tab are appended to the history.
 //
-// For example, suppose the history of page_ids in the instant RenderView
-// is [4 7 8]. This instant RenderView is committed, and merged into
-// an existing tab with 3 history items, with every page with page_id >= 7
-// is preserved. The resulting page history is [-1 -1 -1 7 8].
+// For example, suppose the history of page_ids in the new tab's RenderView
+// is [4 7 8]. This is merged into an existing tab with 3 history items, and
+// all pages in the new tab with page_id >= 7 are to be preserved.
+// The resulting page history is [-1 -1 -1 7 8].
 IPC_MESSAGE_ROUTED2(ViewMsg_SetHistoryLengthAndPrune,
                     int, /* merge_history_length */
                     int32 /* minimum_page_id */)