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 9086801514f98a7da32ea84db44d632dc3bd664c..4224fc9906dd40b3fc7cdd64830d9c5076d9b0b2 100644 |
--- a/content/browser/frame_host/navigation_controller_impl_unittest.cc |
+++ b/content/browser/frame_host/navigation_controller_impl_unittest.cc |
@@ -3491,7 +3491,7 @@ TEST_F(NavigationControllerTest, RendererInitiatedPendingEntries) { |
main_test_rfh()->SendRendererInitiatedNavigationRequest(url1, false); |
main_test_rfh()->PrepareForCommit(); |
navigator->DidStartProvisionalLoad(main_test_rfh(), url1, |
- base::TimeTicks::Now()); |
+ base::TimeTicks::Now(), false); |
// Simulate what happens if a BrowserURLHandler rewrites the URL, causing |
// the virtual URL to differ from the URL. |
@@ -3506,7 +3506,7 @@ TEST_F(NavigationControllerTest, RendererInitiatedPendingEntries) { |
main_test_rfh()->SendRendererInitiatedNavigationRequest(url2, false); |
main_test_rfh()->PrepareForCommit(); |
navigator->DidStartProvisionalLoad(main_test_rfh(), url2, |
- base::TimeTicks::Now()); |
+ base::TimeTicks::Now(), false); |
EXPECT_EQ(url2, controller.GetPendingEntry()->GetURL()); |
EXPECT_EQ(url2, controller.GetPendingEntry()->GetVirtualURL()); |
@@ -3517,22 +3517,23 @@ TEST_F(NavigationControllerTest, RendererInitiatedPendingEntries) { |
// We should not replace the pending entry for an error URL. |
navigator->DidStartProvisionalLoad(main_test_rfh(), url1, |
- base::TimeTicks::Now()); |
+ base::TimeTicks::Now(), false); |
EXPECT_EQ(url1, controller.GetPendingEntry()->GetURL()); |
- navigator->DidStartProvisionalLoad( |
- main_test_rfh(), GURL(kUnreachableWebDataURL), base::TimeTicks::Now()); |
+ navigator->DidStartProvisionalLoad(main_test_rfh(), |
+ GURL(kUnreachableWebDataURL), |
+ base::TimeTicks::Now(), false); |
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, |
- base::TimeTicks::Now()); |
+ base::TimeTicks::Now(), false); |
controller.GetPendingEntry()->set_should_replace_entry(true); |
main_test_rfh()->SendRendererInitiatedNavigationRequest(url2, false); |
main_test_rfh()->PrepareForCommit(); |
navigator->DidStartProvisionalLoad(main_test_rfh(), url2, |
- base::TimeTicks::Now()); |
+ base::TimeTicks::Now(), false); |
EXPECT_TRUE(controller.GetPendingEntry()->should_replace_entry()); |
main_test_rfh()->SendNavigateWithReplacement(0, false, url2); |
EXPECT_EQ(url2, controller.GetLastCommittedEntry()->GetURL()); |