| Index: content/browser/frame_host/navigation_controller_impl_unittest.cc
|
| diff --git a/content/browser/frame_host/navigation_controller_impl_unittest.cc b/content/browser/frame_host/navigation_controller_impl_unittest.cc
|
| index f1100395e995024650eb2dd5d018c453aed8d4e0..fb2a3fdae8411c2f3a3d6d2c96c12087eed00748 100644
|
| --- a/content/browser/frame_host/navigation_controller_impl_unittest.cc
|
| +++ b/content/browser/frame_host/navigation_controller_impl_unittest.cc
|
| @@ -3282,7 +3282,8 @@ TEST_F(NavigationControllerTest, RendererInitiatedPendingEntries) {
|
| // can show them in new tabs when it is safe.
|
| main_test_rfh()->SendRendererInitiatedNavigationRequest(url1, false);
|
| main_test_rfh()->PrepareForCommit();
|
| - navigator->DidStartProvisionalLoad(main_test_rfh(), url1);
|
| + navigator->DidStartProvisionalLoad(main_test_rfh(), url1,
|
| + base::TimeTicks::Now());
|
|
|
| // Simulate what happens if a BrowserURLHandler rewrites the URL, causing
|
| // the virtual URL to differ from the URL.
|
| @@ -3296,7 +3297,8 @@ TEST_F(NavigationControllerTest, RendererInitiatedPendingEntries) {
|
| // If the user clicks another link, we should replace the pending entry.
|
| main_test_rfh()->SendRendererInitiatedNavigationRequest(url2, false);
|
| main_test_rfh()->PrepareForCommit();
|
| - navigator->DidStartProvisionalLoad(main_test_rfh(), url2);
|
| + navigator->DidStartProvisionalLoad(main_test_rfh(), url2,
|
| + base::TimeTicks::Now());
|
| EXPECT_EQ(url2, controller.GetPendingEntry()->GetURL());
|
| EXPECT_EQ(url2, controller.GetPendingEntry()->GetVirtualURL());
|
|
|
| @@ -3306,20 +3308,23 @@ TEST_F(NavigationControllerTest, RendererInitiatedPendingEntries) {
|
| EXPECT_EQ(url2, controller.GetLastCommittedEntry()->GetVirtualURL());
|
|
|
| // We should not replace the pending entry for an error URL.
|
| - navigator->DidStartProvisionalLoad(main_test_rfh(), url1);
|
| + navigator->DidStartProvisionalLoad(main_test_rfh(), url1,
|
| + base::TimeTicks::Now());
|
| EXPECT_EQ(url1, controller.GetPendingEntry()->GetURL());
|
| - navigator->DidStartProvisionalLoad(main_test_rfh(),
|
| - GURL(kUnreachableWebDataURL));
|
| + navigator->DidStartProvisionalLoad(
|
| + main_test_rfh(), GURL(kUnreachableWebDataURL), base::TimeTicks::Now());
|
| EXPECT_EQ(url1, controller.GetPendingEntry()->GetURL());
|
|
|
| // We should remember if the pending entry will replace the current one.
|
| // http://crbug.com/308444.
|
| - navigator->DidStartProvisionalLoad(main_test_rfh(), url1);
|
| + navigator->DidStartProvisionalLoad(main_test_rfh(), url1,
|
| + base::TimeTicks::Now());
|
| controller.GetPendingEntry()->set_should_replace_entry(true);
|
|
|
| main_test_rfh()->SendRendererInitiatedNavigationRequest(url2, false);
|
| main_test_rfh()->PrepareForCommit();
|
| - navigator->DidStartProvisionalLoad(main_test_rfh(), url2);
|
| + navigator->DidStartProvisionalLoad(main_test_rfh(), url2,
|
| + base::TimeTicks::Now());
|
| EXPECT_TRUE(controller.GetPendingEntry()->should_replace_entry());
|
| main_test_rfh()->SendNavigate(0, 0, false, url2);
|
| EXPECT_EQ(url2, controller.GetLastCommittedEntry()->GetURL());
|
|
|