Solidify Entry discarding logic (NavigationHandle keeps its ID)

content/public/browser/navigation_handle.cc

Index: content/public/browser/navigation_handle.cc
diff --git a/content/public/browser/navigation_handle.cc b/content/public/browser/navigation_handle.cc
index 4926947a2e926cde7b3f25ea96bc20ae22680377..eb54943a34e1bd4d8ddb8395fc7505c655d327ed 100644
--- a/content/public/browser/navigation_handle.cc
+++ b/content/public/browser/navigation_handle.cc
@@ -24,10 +24,11 @@ WebContents* NavigationHandle::GetWebContents() {
 scoped_ptr<NavigationHandle> NavigationHandle::CreateNavigationHandleForTesting(
     const GURL& url,
     RenderFrameHost* render_frame_host) {
+  FrameTreeNode* node =
+      static_cast<RenderFrameHostImpl*>(render_frame_host)->frame_tree_node();
   scoped_ptr<NavigationHandleImpl> handle_impl = NavigationHandleImpl::Create(
-      url,
-      static_cast<RenderFrameHostImpl*>(render_frame_host)->frame_tree_node(),
-      base::TimeTicks::Now());
+      url, node, base::TimeTicks::Now(),
+      node->navigator()->GetController()->GetPendingEntry());
   return scoped_ptr<NavigationHandle>(std::move(handle_impl));
 }