Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4580)

Unified Diff: content/browser/frame_host/navigation_controller_impl_unittest.cc

Issue 2657323003: Convert HistoryTabHelper to use the new navigation callbacks. (Closed)
Patch Set: nit Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 32c00d16b33ef9348fbffc37ebeb3e6069d440d7..0abf6409dbb892e83d1b68974fccbfb08b13c793 100644
--- a/content/browser/frame_host/navigation_controller_impl_unittest.cc
+++ b/content/browser/frame_host/navigation_controller_impl_unittest.cc
@@ -3482,7 +3482,7 @@ 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, std::vector<GURL>(),
base::TimeTicks::Now());
// Simulate what happens if a BrowserURLHandler rewrites the URL, causing
@@ -3497,7 +3497,7 @@ 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, std::vector<GURL>(),
base::TimeTicks::Now());
EXPECT_EQ(url2, controller.GetPendingEntry()->GetURL());
EXPECT_EQ(url2, controller.GetPendingEntry()->GetVirtualURL());
@@ -3508,22 +3508,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, std::vector<GURL>(),
base::TimeTicks::Now());
EXPECT_EQ(url1, controller.GetPendingEntry()->GetURL());
navigator->DidStartProvisionalLoad(
- main_test_rfh(), GURL(kUnreachableWebDataURL), base::TimeTicks::Now());
+ main_test_rfh(), GURL(kUnreachableWebDataURL), std::vector<GURL>(),
+ 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, std::vector<GURL>(),
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, std::vector<GURL>(),
base::TimeTicks::Now());
EXPECT_TRUE(controller.GetPendingEntry()->should_replace_entry());
main_test_rfh()->SendNavigateWithReplacement(0, false, url2);
« no previous file with comments | « content/browser/frame_host/interstitial_page_navigator_impl.cc ('k') | content/browser/frame_host/navigation_handle_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698