| 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 d03a5500a84a0efced7c571c9252b265256ad40a..119c112afe5a00e8865b86463021814420517965 100644
|
| --- a/content/browser/frame_host/navigation_controller_impl_unittest.cc
|
| +++ b/content/browser/frame_host/navigation_controller_impl_unittest.cc
|
| @@ -2801,7 +2801,7 @@ TEST_F(NavigationControllerTest, RendererInitiatedPendingEntries) {
|
|
|
| // We create pending entries for renderer-initiated navigations so that we
|
| // can show them in new tabs when it is safe.
|
| - navigator->DidStartProvisionalLoad(main_test_rfh(), url1);
|
| + navigator->DidStartProvisionalLoad(main_test_rfh(), url1, false);
|
|
|
| // Simulate what happens if a BrowserURLHandler rewrites the URL, causing
|
| // the virtual URL to differ from the URL.
|
| @@ -2815,7 +2815,7 @@ TEST_F(NavigationControllerTest, RendererInitiatedPendingEntries) {
|
| is_renderer_initiated());
|
|
|
| // If the user clicks another link, we should replace the pending entry.
|
| - navigator->DidStartProvisionalLoad(main_test_rfh(), url2);
|
| + navigator->DidStartProvisionalLoad(main_test_rfh(), url2, false);
|
| EXPECT_EQ(url2, controller.GetPendingEntry()->GetURL());
|
| EXPECT_EQ(url2, controller.GetPendingEntry()->GetVirtualURL());
|
|
|
| @@ -2825,18 +2825,18 @@ 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, false);
|
| EXPECT_EQ(url1, controller.GetPendingEntry()->GetURL());
|
| navigator->DidStartProvisionalLoad(main_test_rfh(),
|
| - GURL(kUnreachableWebDataURL));
|
| + GURL(kUnreachableWebDataURL), 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);
|
| + navigator->DidStartProvisionalLoad(main_test_rfh(), url1, false);
|
| NavigationEntryImpl::FromNavigationEntry(controller.GetPendingEntry())->
|
| set_should_replace_entry(true);
|
| - navigator->DidStartProvisionalLoad(main_test_rfh(), url2);
|
| + navigator->DidStartProvisionalLoad(main_test_rfh(), url2, false);
|
| EXPECT_TRUE(
|
| NavigationEntryImpl::FromNavigationEntry(controller.GetPendingEntry())->
|
| should_replace_entry());
|
|
|