Commit 1d7a411f authored by clamy's avatar clamy Committed by Commit Bot

Remove usage of GetActiveEntry [4/n]

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

Bug: 273710
Change-Id: Ieafcedbb929d97847e379a8b7b383c42905dbe19
Reviewed-on: https://chromium-review.googlesource.com/1102460Reviewed-by: default avatarIstiaque Ahmed <lazyboy@chromium.org>
Commit-Queue: Camille Lamy <clamy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#567654}
parent d778f2e2
......@@ -183,7 +183,10 @@ class ServiceWorkerTest : public ExtensionApiTest,
// Navigates the browser to |url| and returns the new tab's page type.
content::PageType NavigateAndGetPageType(const GURL& url) {
return Navigate(url)->GetController().GetActiveEntry()->GetPageType();
return Navigate(url)
->GetController()
.GetLastCommittedEntry()
->GetPageType();
}
// Extracts the innerText from |contents|.
......
......@@ -47,8 +47,6 @@ IN_PROC_BROWSER_TEST_F(ViewExtensionSourceTest, ViewSourceTabRestore) {
content::WebContents* view_source_tab =
browser()->tab_strip_model()->GetActiveWebContents();
EXPECT_EQ(view_source_url, view_source_tab->GetVisibleURL());
EXPECT_EQ(view_source_url,
view_source_tab->GetController().GetActiveEntry()->GetVirtualURL());
EXPECT_EQ(bookmarks_extension_url,
view_source_tab->GetMainFrame()->GetLastCommittedURL());
EXPECT_FALSE(chrome::CanViewSource(browser()));
......@@ -72,8 +70,6 @@ IN_PROC_BROWSER_TEST_F(ViewExtensionSourceTest, ViewSourceTabRestore) {
// but with view-source, we should still see it as
// view-source:chrome-extension://.../.
EXPECT_EQ(view_source_url, view_source_tab->GetVisibleURL());
EXPECT_EQ(view_source_url,
view_source_tab->GetController().GetActiveEntry()->GetVirtualURL());
EXPECT_EQ(bookmarks_extension_url,
view_source_tab->GetMainFrame()->GetLastCommittedURL());
EXPECT_FALSE(chrome::CanViewSource(browser()));
......
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