Commit 774a15ac authored by clamy's avatar clamy Committed by Commit Bot

Remove usage of GetActiveEntry [9/n]

This CL is part of a serie of CLs to remove usage of the deprecated
method NavigationController::GetActiveEntry.

Bug: 273710
Change-Id: I28d733a8f7fd7935b2cae8f7bea7d96be5370e00
Reviewed-on: https://chromium-review.googlesource.com/1102500
Commit-Queue: Chris Hamilton <chrisha@chromium.org>
Reviewed-by: default avatarChris Hamilton <chrisha@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568011}
parent c21d5d94
...@@ -584,7 +584,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoreIndividualTabFromWindow) { ...@@ -584,7 +584,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoreIndividualTabFromWindow) {
browser()->tab_strip_model()->GetActiveWebContents(); browser()->tab_strip_model()->GetActiveWebContents();
ASSERT_TRUE(contents); ASSERT_TRUE(contents);
const content::NavigationEntry* entry = const content::NavigationEntry* entry =
contents->GetController().GetActiveEntry(); contents->GetController().GetLastCommittedEntry();
ASSERT_TRUE(entry); ASSERT_TRUE(entry);
EXPECT_EQ(timestamp, entry->GetTimestamp()); EXPECT_EQ(timestamp, entry->GetTimestamp());
EXPECT_EQ(http_status_code, entry->GetHttpStatusCode()); EXPECT_EQ(http_status_code, entry->GetHttpStatusCode());
...@@ -833,11 +833,11 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoreForeignSession) { ...@@ -833,11 +833,11 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoreForeignSession) {
ASSERT_TRUE(web_contents_2->GetUserAgentOverride().empty()); ASSERT_TRUE(web_contents_2->GetUserAgentOverride().empty());
content::NavigationEntry* entry = content::NavigationEntry* entry =
web_contents_1->GetController().GetActiveEntry(); web_contents_1->GetController().GetLastCommittedEntry();
ASSERT_TRUE(entry); ASSERT_TRUE(entry);
ASSERT_FALSE(entry->GetIsOverridingUserAgent()); ASSERT_FALSE(entry->GetIsOverridingUserAgent());
entry = web_contents_2->GetController().GetActiveEntry(); entry = web_contents_2->GetController().GetLastCommittedEntry();
ASSERT_TRUE(entry); ASSERT_TRUE(entry);
ASSERT_FALSE(entry->GetIsOverridingUserAgent()); ASSERT_FALSE(entry->GetIsOverridingUserAgent());
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment