Replace page id for updating the history offset.

BUG=369661
TEST=All navigation tests remain green.

Review URL: https://codereview.chromium.org/1131183004

Cr-Commit-Position: refs/heads/master@{#329699}

content/renderer/render_frame_impl.cc

@@ -2706,18 +2706,14 @@ void RenderFrameImpl::didCommitProvisionalLoad(
   } else {
     const RequestNavigationParams& request_params =
         navigation_state->request_params();
-    if (request_params.page_id != -1) {
+    if (request_params.nav_entry_id != 0 &&
+        !request_params.intended_as_new_entry) {
       // This is a successful session history navigation!
       render_view_->page_id_ = request_params.page_id;
 
       render_view_->history_list_offset_ =
           request_params.pending_history_list_offset;
     }
-    // Page id is going away (http://crbug.com/369661); ensure that a
-    // replacement that doesn't use page id is equivalent in all cases.
-    CHECK_EQ(request_params.page_id != -1,
-             request_params.nav_entry_id != 0 &&
-             !request_params.intended_as_new_entry);
   }
 
   bool sent = Send(