Solidify Entry discarding logic (NavigationHandle keeps its ID)

content/browser/frame_host/navigation_handle_impl_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/macros.h"
 #include "content/browser/frame_host/navigation_handle_impl.h"
 #include "content/public/browser/navigation_throttle.h"
 #include "content/test/test_render_frame_host.h"
 
 namespace content {
@@ skipping 35 matching lines @@
 };
 
 class NavigationHandleImplTest : public RenderViewHostImplTestHarness {
  public:
   NavigationHandleImplTest()
       : was_callback_called_(false),
         callback_result_(NavigationThrottle::DEFER) {}
 
   void SetUp() override {
     RenderViewHostImplTestHarness::SetUp();
-    test_handle_ = NavigationHandleImpl::Create(
-        GURL(), main_test_rfh()->frame_tree_node(), base::TimeTicks::Now());
+    test_handle_ =
+        NavigationHandleImpl::Create(GURL(), main_test_rfh()->frame_tree_node(),
+                                     base::TimeTicks::Now(), nullptr);

[Charlie Reis, 2016/02/05 19:36:12]

Should we have some tests for the non-null case?

[Charlie Harrison, 2016/02/05 23:10:23]

Not sure. These tests (afaict) don't really do much integration, so it isn't
clear what to actually set this as. clamy@, thoughts?

   }
 
   void TearDown() override {
     // Release the |test_handle_| before destroying the WebContents, to match
     // the WebContentsObserverSanityChecker expectations.
     test_handle_.reset();
     RenderViewHostImplTestHarness::TearDown();
   }
 
   bool IsDeferringStart() {
@@ skipping 413 matching lines @@
   EXPECT_FALSE(IsDeferringRedirect());
   EXPECT_TRUE(was_callback_called());
   EXPECT_EQ(NavigationThrottle::CANCEL_AND_IGNORE, callback_result());
   EXPECT_EQ(0, cancel_throttle->will_start_calls());
   EXPECT_EQ(1, cancel_throttle->will_redirect_calls());
   EXPECT_EQ(0, proceed_throttle->will_start_calls());
   EXPECT_EQ(0, proceed_throttle->will_redirect_calls());
 }
 
 }  // namespace content