diff options
Diffstat (limited to 'chrome/browser/navigation_controller_unittest.cc')
| -rw-r--r-- | chrome/browser/navigation_controller_unittest.cc | 37 |
1 files changed, 14 insertions, 23 deletions
diff --git a/chrome/browser/navigation_controller_unittest.cc b/chrome/browser/navigation_controller_unittest.cc index 7938877..b2e21cf 100644 --- a/chrome/browser/navigation_controller_unittest.cc +++ b/chrome/browser/navigation_controller_unittest.cc @@ -794,8 +794,7 @@ TEST_F(NavigationControllerTest, NewSubframe) { params.is_post = false; NavigationController::LoadCommittedDetails details; - EXPECT_TRUE(contents->controller()->RendererDidNavigate(params, false, - &details)); + EXPECT_TRUE(contents->controller()->RendererDidNavigate(params, &details)); EXPECT_TRUE(notifications.Check1AndReset(NOTIFY_NAV_ENTRY_COMMITTED)); EXPECT_EQ(url1, details.previous_url); EXPECT_FALSE(details.is_auto); @@ -829,8 +828,7 @@ TEST_F(NavigationControllerTest, SubframeOnEmptyPage) { params.is_post = false; NavigationController::LoadCommittedDetails details; - EXPECT_FALSE(contents->controller()->RendererDidNavigate(params, false, - &details)); + EXPECT_FALSE(contents->controller()->RendererDidNavigate(params, &details)); EXPECT_EQ(0, notifications.size()); } @@ -855,8 +853,7 @@ TEST_F(NavigationControllerTest, AutoSubframe) { // Navigating should do nothing. NavigationController::LoadCommittedDetails details; - EXPECT_FALSE(contents->controller()->RendererDidNavigate(params, false, - &details)); + EXPECT_FALSE(contents->controller()->RendererDidNavigate(params, &details)); EXPECT_EQ(0, notifications.size()); // There should still be only one entry. @@ -885,8 +882,7 @@ TEST_F(NavigationControllerTest, BackSubframe) { // This should generate a new entry. NavigationController::LoadCommittedDetails details; - EXPECT_TRUE(contents->controller()->RendererDidNavigate(params, false, - &details)); + EXPECT_TRUE(contents->controller()->RendererDidNavigate(params, &details)); EXPECT_TRUE(notifications.Check1AndReset(NOTIFY_NAV_ENTRY_COMMITTED)); EXPECT_EQ(2, contents->controller()->GetEntryCount()); @@ -894,8 +890,7 @@ TEST_F(NavigationControllerTest, BackSubframe) { const GURL url3(scheme1() + ":foo3"); params.page_id = 2; params.url = url3; - EXPECT_TRUE(contents->controller()->RendererDidNavigate(params, false, - &details)); + EXPECT_TRUE(contents->controller()->RendererDidNavigate(params, &details)); EXPECT_TRUE(notifications.Check1AndReset(NOTIFY_NAV_ENTRY_COMMITTED)); EXPECT_EQ(3, contents->controller()->GetEntryCount()); EXPECT_EQ(2, contents->controller()->GetCurrentEntryIndex()); @@ -904,8 +899,7 @@ TEST_F(NavigationControllerTest, BackSubframe) { contents->controller()->GoBack(); params.url = url2; params.page_id = 1; - EXPECT_TRUE(contents->controller()->RendererDidNavigate(params, false, - &details)); + EXPECT_TRUE(contents->controller()->RendererDidNavigate(params, &details)); EXPECT_TRUE(notifications.Check1AndReset(NOTIFY_NAV_ENTRY_COMMITTED)); EXPECT_EQ(3, contents->controller()->GetEntryCount()); EXPECT_EQ(1, contents->controller()->GetCurrentEntryIndex()); @@ -914,8 +908,7 @@ TEST_F(NavigationControllerTest, BackSubframe) { contents->controller()->GoBack(); params.url = url1; params.page_id = 0; - EXPECT_TRUE(contents->controller()->RendererDidNavigate(params, false, - &details)); + EXPECT_TRUE(contents->controller()->RendererDidNavigate(params, &details)); EXPECT_TRUE(notifications.Check1AndReset(NOTIFY_NAV_ENTRY_COMMITTED)); EXPECT_EQ(3, contents->controller()->GetEntryCount()); EXPECT_EQ(0, contents->controller()->GetCurrentEntryIndex()); @@ -966,8 +959,7 @@ TEST_F(NavigationControllerTest, InPage) { // This should generate a new entry. NavigationController::LoadCommittedDetails details; - EXPECT_TRUE(contents->controller()->RendererDidNavigate(params, false, - &details)); + EXPECT_TRUE(contents->controller()->RendererDidNavigate(params, &details)); EXPECT_TRUE(notifications.Check1AndReset(NOTIFY_NAV_ENTRY_COMMITTED)); EXPECT_EQ(2, contents->controller()->GetEntryCount()); @@ -976,7 +968,7 @@ TEST_F(NavigationControllerTest, InPage) { contents->controller()->GoBack(); back_params.url = url1; back_params.page_id = 0; - EXPECT_TRUE(contents->controller()->RendererDidNavigate(back_params, false, + EXPECT_TRUE(contents->controller()->RendererDidNavigate(back_params, &details)); EXPECT_TRUE(notifications.Check1AndReset(NOTIFY_NAV_ENTRY_COMMITTED)); EXPECT_EQ(2, contents->controller()->GetEntryCount()); @@ -988,7 +980,7 @@ TEST_F(NavigationControllerTest, InPage) { contents->controller()->GoForward(); forward_params.url = url2; forward_params.page_id = 1; - EXPECT_TRUE(contents->controller()->RendererDidNavigate(forward_params, false, + EXPECT_TRUE(contents->controller()->RendererDidNavigate(forward_params, &details)); EXPECT_TRUE(notifications.Check1AndReset(NOTIFY_NAV_ENTRY_COMMITTED)); EXPECT_EQ(2, contents->controller()->GetEntryCount()); @@ -1001,10 +993,10 @@ TEST_F(NavigationControllerTest, InPage) { // one identified by an existing page ID. This would result in the second URL // losing the reference fragment when you navigate away from it and then back. contents->controller()->GoBack(); - EXPECT_TRUE(contents->controller()->RendererDidNavigate(back_params, false, + EXPECT_TRUE(contents->controller()->RendererDidNavigate(back_params, &details)); contents->controller()->GoForward(); - EXPECT_TRUE(contents->controller()->RendererDidNavigate(forward_params, false, + EXPECT_TRUE(contents->controller()->RendererDidNavigate(forward_params, &details)); EXPECT_EQ(forward_params.url, contents->controller()->GetActiveEntry()->url()); @@ -1250,7 +1242,7 @@ TEST_F(NavigationControllerTest, RestoreNavigate) { params.gesture = NavigationGestureUser; params.is_post = false; NavigationController::LoadCommittedDetails details; - controller->RendererDidNavigate(params, false, &details); + controller->RendererDidNavigate(params, &details); // There should be no longer any pending entry and one committed one. This // means that we were able to locate the entry, assign its site instance, and @@ -1520,8 +1512,7 @@ TEST_F(NavigationControllerTest, SameSubframe) { params.gesture = NavigationGestureAuto; params.is_post = false; NavigationController::LoadCommittedDetails details; - EXPECT_FALSE(contents->controller()->RendererDidNavigate(params, false, - &details)); + EXPECT_FALSE(contents->controller()->RendererDidNavigate(params, &details)); // Nothing should have changed. EXPECT_EQ(contents->controller()->GetEntryCount(), 1); |