Merge 129306 - Prevent state updates for kSwappedOutURL.

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
===================================================================
--- content/renderer/render_view_impl.cc	(revision 130205)
+++ content/renderer/render_view_impl.cc	(working copy)
@@ -1288,9 +1288,17 @@
 
   const WebHistoryItem& item =
       webview()->mainFrame()->previousHistoryItem();
+  SendUpdateState(item);
+}
+
+void RenderViewImpl::SendUpdateState(const WebHistoryItem& item) {
   if (item.isNull())
     return;
 
+  // Don't send state updates for about:swappedout.
+  if (item.urlString() == WebString::fromUTF8("about:swappedout"))
+    return;
+
   Send(new ViewHostMsg_UpdateState(
       routing_id_, page_id_, webkit_glue::HistoryItemToString(item)));
 }
@@ -3509,11 +3517,7 @@
     return;
 
   const WebHistoryItem& item = webview()->mainFrame()->currentHistoryItem();
-  if (item.isNull())
-    return;
-
-  Send(new ViewHostMsg_UpdateState(
-      routing_id_, page_id_, webkit_glue::HistoryItemToString(item)));
+  SendUpdateState(item);
 }
 
 void RenderViewImpl::SyncSelectionIfRequired() {