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

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

Issue 2614913002: Remove additional uses of UseSubframeNavigationEntries in tests. (Closed)
Patch Set: Postpone bug 618100 changes Created 3 years, 11 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/frame_host/navigation_controller_impl_browsertest.cc
diff --git a/content/browser/frame_host/navigation_controller_impl_browsertest.cc b/content/browser/frame_host/navigation_controller_impl_browsertest.cc
index 7c329e9483b3de4ff6b6499d6b0362cf070e1aab..af3a4999865428e40593d9cde1d99fc5b55f3435 100644
--- a/content/browser/frame_host/navigation_controller_impl_browsertest.cc
+++ b/content/browser/frame_host/navigation_controller_impl_browsertest.cc
@@ -4978,12 +4978,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
// initial blank page. That might require updating all relevant NavEntries to
// know what the first committed URL is, so that we really elide the initial
// blank page from history.
- //
- // TODO(creis): This actually goes to frame_url in some cases when subframe
- // FrameNavigationEntries are enabled, due to a mismatch between PageState and
- // the entry's URL. That should be fixed in https://crbug.com/617239.
- if (!SiteIsolationPolicy::UseSubframeNavigationEntries())
- EXPECT_EQ(blank_url, frame->current_url());
+ EXPECT_EQ(blank_url, frame->current_url());
}
// This test is similar to "BackToAboutBlankIframe" above, except that a
@@ -5104,12 +5099,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
// TODO(creis): It's a bit surprising to go to frame_url_1 here instead of
// frame_url_2. Perhaps we should be going back to frame_url_1 when going
// back two entries above, since it's different than the initial blank case.
- //
- // TODO(creis): This actually goes to frame_url_2 in some cases when subframe
- // FrameNavigationEntries are enabled, due to a mismatch between PageState and
- // the entry's URL. That should be fixed in https://crbug.com/617239.
- if (!SiteIsolationPolicy::UseSubframeNavigationEntries())
- EXPECT_EQ(frame_url_1, frame->current_url());
+ EXPECT_EQ(frame_url_1, frame->current_url());
}
// Test for in-page navigation kills due to using the wrong history item in
@@ -5227,12 +5217,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
// TODO(creis): It's a bit surprising to go to frame_url_1 here instead of
// frame_url_2. Perhaps we should be going back to frame_url_1 when going
// back two entries above, since it's different than the initial blank case.
- //
- // TODO(creis): This actually goes to frame_url_2 in some cases when subframe
- // FrameNavigationEntries are enabled, due to a mismatch between PageState and
- // the entry's URL. That should be fixed in https://crbug.com/617239.
- if (!SiteIsolationPolicy::UseSubframeNavigationEntries())
- EXPECT_EQ(frame_url_1, frame->current_url());
+ EXPECT_EQ(frame_url_1, frame->current_url());
}
// Test for in-page navigation kills when going back to about:blank after a
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698