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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2225343002: Navigation: move RestoreType and ReloadType into a separate file (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase+ Created 4 years, 4 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
« content/browser/frame_host/navigation_controller_impl.cc ('K') | « content/browser/frame_host/navigation_controller_impl.cc ('k') | content/browser/frame_host/navigation_controller_impl_unittest.cc » ('j') | content/public/browser/navigation_types.h » ('J')
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 90071685b7ae781e3a0271f5d0bcd654c9d74279..d12ebbf8b6a3ebdfcd52cb70fa6bf15c17a295f1 100644
--- a/content/browser/frame_host/navigation_controller_impl_browsertest.cc
+++ b/content/browser/frame_host/navigation_controller_impl_browsertest.cc
@@ -774,7 +774,7 @@ class LoadCommittedCapturer : public WebContentsObserver {
// subframe navigation without having any committed entry. Such navigations
// just get thrown on the ground, but we shouldn't crash.
//
-// This test actually hits NAVIGATION_TYPE_NAV_IGNORE four times. Two of them,
+// This test actually hits NavigationType::NAV_IGNORE four times. Two of them,
// the initial window.open() and the iframe creation, don't try to create
// navigation entries, and the third and fourth, the new navigations, try to.
IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest, SubframeOnEmptyPage) {
@@ -943,7 +943,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
FrameNavigateParamsCapturer capturer(root);
NavigateFrameToURL(root, error_url);
capturer.Wait();
- EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.details().type);
+ EXPECT_EQ(NavigationType::NEW_PAGE, capturer.details().type);
NavigationEntry* entry = controller.GetLastCommittedEntry();
EXPECT_EQ(PAGE_TYPE_ERROR, entry->GetPageType());
EXPECT_EQ(2, controller.GetEntryCount());
@@ -958,7 +958,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
FrameNavigateParamsCapturer capturer(root);
NavigateFrameToURL(root, error_url);
capturer.Wait();
- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);
+ EXPECT_EQ(NavigationType::EXISTING_PAGE, capturer.details().type);
NavigationEntry* entry = controller.GetLastCommittedEntry();
EXPECT_EQ(PAGE_TYPE_ERROR, entry->GetPageType());
EXPECT_EQ(2, controller.GetEntryCount());
@@ -976,7 +976,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
FrameNavigateParamsCapturer capturer(root);
RendererLocationReplace(shell(), error_url);
capturer.Wait();
- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);
+ EXPECT_EQ(NavigationType::EXISTING_PAGE, capturer.details().type);
NavigationEntry* entry = controller.GetLastCommittedEntry();
EXPECT_EQ(PAGE_TYPE_ERROR, entry->GetPageType());
EXPECT_EQ(3, controller.GetEntryCount());
@@ -994,7 +994,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
FrameNavigateParamsCapturer capturer(root);
RendererLocationReplace(shell(), error_url);
capturer.Wait();
- EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.details().type);
+ EXPECT_EQ(NavigationType::NEW_PAGE, capturer.details().type);
NavigationEntry* entry = controller.GetLastCommittedEntry();
EXPECT_EQ(PAGE_TYPE_ERROR, entry->GetPageType());
EXPECT_EQ(4, controller.GetEntryCount());
@@ -1004,7 +1004,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
// Various tests for navigation type classifications. TODO(avi): It's rather
// bogus that the same info is in two different enums; http://crbug.com/453555.
-// Verify that navigations for NAVIGATION_TYPE_NEW_PAGE are correctly
+// Verify that navigations for NavigationType::NEW_PAGE are correctly
// classified.
IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
NavigationTypeClassification_NewPage) {
@@ -1025,7 +1025,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
// transition? Lots of these transitions should be cleaned up.
EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
capturer.params().transition, ui::PAGE_TRANSITION_LINK));
- EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.details().type);
+ EXPECT_EQ(NavigationType::NEW_PAGE, capturer.details().type);
EXPECT_FALSE(capturer.details().is_in_page);
}
@@ -1037,7 +1037,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
capturer.Wait();
EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
capturer.params().transition, ui::PAGE_TRANSITION_LINK));
- EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.details().type);
+ EXPECT_EQ(NavigationType::NEW_PAGE, capturer.details().type);
EXPECT_TRUE(capturer.details().is_in_page);
}
@@ -1049,7 +1049,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
capturer.Wait();
EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
capturer.params().transition, ui::PAGE_TRANSITION_LINK));
- EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.details().type);
+ EXPECT_EQ(NavigationType::NEW_PAGE, capturer.details().type);
EXPECT_FALSE(capturer.details().is_in_page);
}
@@ -1065,7 +1065,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
capturer.params().transition,
ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK |
ui::PAGE_TRANSITION_CLIENT_REDIRECT)));
- EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.details().type);
+ EXPECT_EQ(NavigationType::NEW_PAGE, capturer.details().type);
EXPECT_FALSE(capturer.details().is_in_page);
}
@@ -1080,7 +1080,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
capturer.params().transition,
ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK |
ui::PAGE_TRANSITION_CLIENT_REDIRECT)));
- EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.details().type);
+ EXPECT_EQ(NavigationType::NEW_PAGE, capturer.details().type);
EXPECT_TRUE(capturer.details().is_in_page);
}
@@ -1096,12 +1096,12 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
capturer.params().transition,
ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK |
ui::PAGE_TRANSITION_CLIENT_REDIRECT)));
- EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.details().type);
+ EXPECT_EQ(NavigationType::NEW_PAGE, capturer.details().type);
EXPECT_FALSE(capturer.details().is_in_page);
}
}
-// Verify that navigations for NAVIGATION_TYPE_EXISTING_PAGE are correctly
+// Verify that navigations for NavigationType::EXISTING_PAGE are correctly
// classified.
IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
NavigationTypeClassification_ExistingPage) {
@@ -1126,7 +1126,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
ui::PageTransitionFromInt(ui::PAGE_TRANSITION_TYPED |
ui::PAGE_TRANSITION_FORWARD_BACK |
ui::PAGE_TRANSITION_FROM_ADDRESS_BAR)));
- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);
+ EXPECT_EQ(NavigationType::EXISTING_PAGE, capturer.details().type);
EXPECT_FALSE(capturer.details().is_in_page);
}
@@ -1140,7 +1140,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
ui::PageTransitionFromInt(ui::PAGE_TRANSITION_TYPED |
ui::PAGE_TRANSITION_FORWARD_BACK |
ui::PAGE_TRANSITION_FROM_ADDRESS_BAR)));
- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);
+ EXPECT_EQ(NavigationType::EXISTING_PAGE, capturer.details().type);
EXPECT_FALSE(capturer.details().is_in_page);
}
@@ -1154,7 +1154,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
ui::PageTransitionFromInt(ui::PAGE_TRANSITION_TYPED |
ui::PAGE_TRANSITION_FORWARD_BACK |
ui::PAGE_TRANSITION_FROM_ADDRESS_BAR)));
- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);
+ EXPECT_EQ(NavigationType::EXISTING_PAGE, capturer.details().type);
EXPECT_FALSE(capturer.details().is_in_page);
}
@@ -1168,7 +1168,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
ui::PageTransitionFromInt(ui::PAGE_TRANSITION_TYPED |
ui::PAGE_TRANSITION_FORWARD_BACK |
ui::PAGE_TRANSITION_FROM_ADDRESS_BAR)));
- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);
+ EXPECT_EQ(NavigationType::EXISTING_PAGE, capturer.details().type);
EXPECT_FALSE(capturer.details().is_in_page);
}
@@ -1182,7 +1182,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
ui::PageTransitionFromInt(ui::PAGE_TRANSITION_TYPED |
ui::PAGE_TRANSITION_FORWARD_BACK |
ui::PAGE_TRANSITION_FROM_ADDRESS_BAR)));
- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);
+ EXPECT_EQ(NavigationType::EXISTING_PAGE, capturer.details().type);
EXPECT_FALSE(capturer.details().is_in_page);
}
@@ -1196,7 +1196,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
ui::PageTransitionFromInt(ui::PAGE_TRANSITION_TYPED |
ui::PAGE_TRANSITION_FORWARD_BACK |
ui::PAGE_TRANSITION_FROM_ADDRESS_BAR)));
- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);
+ EXPECT_EQ(NavigationType::EXISTING_PAGE, capturer.details().type);
EXPECT_FALSE(capturer.details().is_in_page);
}
@@ -1207,7 +1207,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
capturer.Wait();
EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
capturer.params().transition, ui::PAGE_TRANSITION_RELOAD));
- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);
+ EXPECT_EQ(NavigationType::EXISTING_PAGE, capturer.details().type);
EXPECT_FALSE(capturer.details().is_in_page);
}
@@ -1220,7 +1220,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
capturer.params().transition,
ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK |
ui::PAGE_TRANSITION_CLIENT_REDIRECT)));
- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);
+ EXPECT_EQ(NavigationType::EXISTING_PAGE, capturer.details().type);
EXPECT_FALSE(capturer.details().is_in_page);
}
@@ -1238,7 +1238,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
capturer.params().transition,
ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK |
ui::PAGE_TRANSITION_CLIENT_REDIRECT)));
- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);
+ EXPECT_EQ(NavigationType::EXISTING_PAGE, capturer.details().type);
EXPECT_FALSE(capturer.details().is_in_page);
}
@@ -1255,7 +1255,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
capturer.params().transition,
ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK |
ui::PAGE_TRANSITION_CLIENT_REDIRECT)));
- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);
+ EXPECT_EQ(NavigationType::EXISTING_PAGE, capturer.details().type);
EXPECT_TRUE(capturer.details().is_in_page);
}
@@ -1278,7 +1278,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
ui::PageTransitionFromInt(ui::PAGE_TRANSITION_TYPED |
ui::PAGE_TRANSITION_FORWARD_BACK |
ui::PAGE_TRANSITION_FROM_ADDRESS_BAR)));
- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);
+ EXPECT_EQ(NavigationType::EXISTING_PAGE, capturer.details().type);
EXPECT_TRUE(capturer.details().is_in_page);
}
@@ -1291,7 +1291,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
capturer.params().transition,
ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK |
ui::PAGE_TRANSITION_FORWARD_BACK)));
- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);
+ EXPECT_EQ(NavigationType::EXISTING_PAGE, capturer.details().type);
EXPECT_TRUE(capturer.details().is_in_page);
}
@@ -1312,7 +1312,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
ui::PageTransitionFromInt(ui::PAGE_TRANSITION_TYPED |
ui::PAGE_TRANSITION_FORWARD_BACK |
ui::PAGE_TRANSITION_FROM_ADDRESS_BAR)));
- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);
+ EXPECT_EQ(NavigationType::EXISTING_PAGE, capturer.details().type);
EXPECT_TRUE(capturer.details().is_in_page);
}
@@ -1325,12 +1325,12 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
capturer.params().transition,
ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK |
ui::PAGE_TRANSITION_FORWARD_BACK)));
- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);
+ EXPECT_EQ(NavigationType::EXISTING_PAGE, capturer.details().type);
EXPECT_TRUE(capturer.details().is_in_page);
}
}
-// Verify that navigations for NAVIGATION_TYPE_SAME_PAGE are correctly
+// Verify that navigations for NavigationType::SAME_PAGE are correctly
// classified.
IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
NavigationTypeClassification_SamePage) {
@@ -1351,7 +1351,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
capturer.Wait();
EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
capturer.params().transition, ui::PAGE_TRANSITION_LINK));
- EXPECT_EQ(NAVIGATION_TYPE_SAME_PAGE, capturer.details().type);
+ EXPECT_EQ(NavigationType::SAME_PAGE, capturer.details().type);
}
}
@@ -1375,12 +1375,12 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
capturer.Wait();
EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
capturer.params().transition, ui::PAGE_TRANSITION_LINK));
- EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.details().type);
+ EXPECT_EQ(NavigationType::NEW_PAGE, capturer.details().type);
}
}
-// Verify that navigations for NAVIGATION_TYPE_NEW_SUBFRAME and
-// NAVIGATION_TYPE_AUTO_SUBFRAME are properly classified.
+// Verify that navigations for NavigationType::NEW_SUBFRAME and
+// NavigationType::AUTO_SUBFRAME are properly classified.
IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
NavigationTypeClassification_NewAndAutoSubframe) {
GURL main_url(embedded_test_server()->GetURL(
@@ -1415,7 +1415,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
capturer.Wait();
EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
capturer.params().transition, ui::PAGE_TRANSITION_MANUAL_SUBFRAME));
- EXPECT_EQ(NAVIGATION_TYPE_NEW_SUBFRAME, capturer.details().type);
+ EXPECT_EQ(NavigationType::NEW_SUBFRAME, capturer.details().type);
}
{
@@ -1425,7 +1425,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
capturer.Wait();
EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
capturer.params().transition, ui::PAGE_TRANSITION_AUTO_SUBFRAME));
- EXPECT_EQ(NAVIGATION_TYPE_AUTO_SUBFRAME, capturer.details().type);
+ EXPECT_EQ(NavigationType::AUTO_SUBFRAME, capturer.details().type);
}
{
@@ -1435,7 +1435,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
capturer.Wait();
EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
capturer.params().transition, ui::PAGE_TRANSITION_AUTO_SUBFRAME));
- EXPECT_EQ(NAVIGATION_TYPE_AUTO_SUBFRAME, capturer.details().type);
+ EXPECT_EQ(NavigationType::AUTO_SUBFRAME, capturer.details().type);
}
{
@@ -1447,7 +1447,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
capturer.Wait();
EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
capturer.params().transition, ui::PAGE_TRANSITION_MANUAL_SUBFRAME));
- EXPECT_EQ(NAVIGATION_TYPE_NEW_SUBFRAME, capturer.details().type);
+ EXPECT_EQ(NavigationType::NEW_SUBFRAME, capturer.details().type);
}
{
@@ -1458,7 +1458,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
capturer.Wait();
EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
capturer.params().transition, ui::PAGE_TRANSITION_MANUAL_SUBFRAME));
- EXPECT_EQ(NAVIGATION_TYPE_NEW_SUBFRAME, capturer.details().type);
+ EXPECT_EQ(NavigationType::NEW_SUBFRAME, capturer.details().type);
}
{
@@ -1471,7 +1471,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
capturer.Wait();
EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
capturer.params().transition, ui::PAGE_TRANSITION_MANUAL_SUBFRAME));
- EXPECT_EQ(NAVIGATION_TYPE_NEW_SUBFRAME, capturer.details().type);
+ EXPECT_EQ(NavigationType::NEW_SUBFRAME, capturer.details().type);
}
{
@@ -1495,7 +1495,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
capturer.Wait();
EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
capturer.params().transition, ui::PAGE_TRANSITION_MANUAL_SUBFRAME));
- EXPECT_EQ(NAVIGATION_TYPE_NEW_SUBFRAME, capturer.details().type);
+ EXPECT_EQ(NavigationType::NEW_SUBFRAME, capturer.details().type);
}
{
@@ -1559,12 +1559,12 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
ASSERT_EQ(2U, details.size());
EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
params[0].transition, ui::PAGE_TRANSITION_LINK));
- EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, details[0].type);
+ EXPECT_EQ(NavigationType::NEW_PAGE, details[0].type);
EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
params[1].transition,
ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK |
ui::PAGE_TRANSITION_CLIENT_REDIRECT)));
- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, details[1].type);
+ EXPECT_EQ(NavigationType::EXISTING_PAGE, details[1].type);
}
}
@@ -1590,7 +1590,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
capturer.Wait();
EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
capturer.params().transition, ui::PAGE_TRANSITION_LINK));
- EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.details().type);
+ EXPECT_EQ(NavigationType::NEW_PAGE, capturer.details().type);
EXPECT_TRUE(capturer.details().is_in_page);
}
@@ -1602,7 +1602,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
capturer.Wait();
EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
capturer.params().transition, ui::PAGE_TRANSITION_LINK));
- EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.details().type);
+ EXPECT_EQ(NavigationType::NEW_PAGE, capturer.details().type);
EXPECT_FALSE(capturer.details().is_in_page);
}
@@ -1629,7 +1629,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
capturer.Wait();
EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
capturer.params().transition, ui::PAGE_TRANSITION_MANUAL_SUBFRAME));
- EXPECT_EQ(NAVIGATION_TYPE_NEW_SUBFRAME, capturer.details().type);
+ EXPECT_EQ(NavigationType::NEW_SUBFRAME, capturer.details().type);
EXPECT_TRUE(capturer.details().is_in_page);
}
@@ -1641,7 +1641,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
capturer.Wait();
EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
capturer.params().transition, ui::PAGE_TRANSITION_MANUAL_SUBFRAME));
- EXPECT_EQ(NAVIGATION_TYPE_NEW_SUBFRAME, capturer.details().type);
+ EXPECT_EQ(NavigationType::NEW_SUBFRAME, capturer.details().type);
EXPECT_FALSE(capturer.details().is_in_page);
}
}
@@ -1964,7 +1964,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
std::string script = "history.pushState({}, 'foo', 'foo')";
EXPECT_TRUE(ExecuteScript(root, script));
capturer.Wait();
- EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.details().type);
+ EXPECT_EQ(NavigationType::NEW_PAGE, capturer.details().type);
EXPECT_TRUE(capturer.details().is_in_page);
}
@@ -2057,7 +2057,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
EXPECT_EQ(bar_url, root->child_at(0)->child_at(0)->current_url());
}
-// Verify the tree of FrameNavigationEntries after NAVIGATION_TYPE_AUTO_SUBFRAME
+// Verify the tree of FrameNavigationEntries after NavigationType::AUTO_SUBFRAME
// commits.
// TODO(creis): Test updating entries for history auto subframe navigations.
IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
@@ -2254,7 +2254,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
}
}
-// Verify the tree of FrameNavigationEntries after NAVIGATION_TYPE_NEW_SUBFRAME
+// Verify the tree of FrameNavigationEntries after NavigationType::NEW_SUBFRAME
// commits.
IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
FrameNavigationEntry_NewSubframe) {
@@ -2290,7 +2290,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
capturer.Wait();
EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
capturer.params().transition, ui::PAGE_TRANSITION_MANUAL_SUBFRAME));
- EXPECT_EQ(NAVIGATION_TYPE_NEW_SUBFRAME, capturer.details().type);
+ EXPECT_EQ(NavigationType::NEW_SUBFRAME, capturer.details().type);
}
// We should have created a new NavigationEntry with the same main frame URL.
@@ -2342,7 +2342,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
capturer.Wait();
EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
capturer.params().transition, ui::PAGE_TRANSITION_MANUAL_SUBFRAME));
- EXPECT_EQ(NAVIGATION_TYPE_NEW_SUBFRAME, capturer.details().type);
+ EXPECT_EQ(NavigationType::NEW_SUBFRAME, capturer.details().type);
}
// We should have created a new NavigationEntry with the same main frame URL.
@@ -2380,7 +2380,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
capturer.Wait();
EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
capturer.params().transition, ui::PAGE_TRANSITION_MANUAL_SUBFRAME));
- EXPECT_EQ(NAVIGATION_TYPE_NEW_SUBFRAME, capturer.details().type);
+ EXPECT_EQ(NavigationType::NEW_SUBFRAME, capturer.details().type);
}
// We should have created a new NavigationEntry with the same main frame URL.
@@ -2550,7 +2550,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
capturer.Wait();
EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
capturer.params().transition, ui::PAGE_TRANSITION_AUTO_SUBFRAME));
- EXPECT_EQ(NAVIGATION_TYPE_AUTO_SUBFRAME, capturer.details().type);
+ EXPECT_EQ(NavigationType::AUTO_SUBFRAME, capturer.details().type);
}
EXPECT_EQ(3, controller.GetEntryCount());
EXPECT_EQ(1, controller.GetLastCommittedEntryIndex());
@@ -2573,7 +2573,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
capturer.Wait();
EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
capturer.params().transition, ui::PAGE_TRANSITION_AUTO_SUBFRAME));
- EXPECT_EQ(NAVIGATION_TYPE_AUTO_SUBFRAME, capturer.details().type);
+ EXPECT_EQ(NavigationType::AUTO_SUBFRAME, capturer.details().type);
}
EXPECT_EQ(3, controller.GetEntryCount());
EXPECT_EQ(0, controller.GetLastCommittedEntryIndex());
@@ -2596,7 +2596,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
capturer.Wait();
EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
capturer.params().transition, ui::PAGE_TRANSITION_AUTO_SUBFRAME));
- EXPECT_EQ(NAVIGATION_TYPE_AUTO_SUBFRAME, capturer.details().type);
+ EXPECT_EQ(NavigationType::AUTO_SUBFRAME, capturer.details().type);
}
EXPECT_EQ(3, controller.GetEntryCount());
EXPECT_EQ(1, controller.GetLastCommittedEntryIndex());
@@ -2619,7 +2619,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
capturer.Wait();
EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
capturer.params().transition, ui::PAGE_TRANSITION_AUTO_SUBFRAME));
- EXPECT_EQ(NAVIGATION_TYPE_AUTO_SUBFRAME, capturer.details().type);
+ EXPECT_EQ(NavigationType::AUTO_SUBFRAME, capturer.details().type);
}
EXPECT_EQ(3, controller.GetEntryCount());
EXPECT_EQ(2, controller.GetLastCommittedEntryIndex());
@@ -3534,9 +3534,8 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
NavigationControllerImpl& new_controller =
static_cast<NavigationControllerImpl&>(
new_shell->web_contents()->GetController());
- new_controller.Restore(
- entries.size() - 1,
- NavigationController::RESTORE_LAST_SESSION_EXITED_CLEANLY, &entries);
+ new_controller.Restore(entries.size() - 1,
+ RestoreType::LAST_SESSION_EXITED_CLEANLY, &entries);
ASSERT_EQ(0u, entries.size());
{
TestNavigationObserver restore_observer(new_shell->web_contents());
@@ -3793,7 +3792,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
capturer.Wait();
EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
capturer.params().transition, ui::PAGE_TRANSITION_RELOAD));
- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);
+ EXPECT_EQ(NavigationType::EXISTING_PAGE, capturer.details().type);
EXPECT_FALSE(capturer.details().is_in_page);
}
@@ -3963,9 +3962,8 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerOopifBrowserTest,
NavigationControllerImpl& new_controller =
static_cast<NavigationControllerImpl&>(
new_shell->web_contents()->GetController());
- new_controller.Restore(
- entries.size() - 1,
- NavigationController::RESTORE_LAST_SESSION_EXITED_CLEANLY, &entries);
+ new_controller.Restore(entries.size() - 1,
+ RestoreType::LAST_SESSION_EXITED_CLEANLY, &entries);
ASSERT_EQ(0u, entries.size());
{
TestNavigationObserver restore_observer(new_shell->web_contents());
@@ -4029,7 +4027,7 @@ void DoReplaceStateWhilePending(Shell* shell,
// The fact that there was a pending entry shouldn't interfere with the
// classification.
- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);
+ EXPECT_EQ(NavigationType::EXISTING_PAGE, capturer.details().type);
EXPECT_TRUE(capturer.details().is_in_page);
}
@@ -4115,7 +4113,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
std::string script = "history.pushState({}, '', 'pushed')";
EXPECT_TRUE(ExecuteScript(root, script));
capturer.Wait();
- EXPECT_EQ(NAVIGATION_TYPE_NEW_PAGE, capturer.details().type);
+ EXPECT_EQ(NavigationType::NEW_PAGE, capturer.details().type);
EXPECT_TRUE(capturer.details().is_in_page);
}
@@ -4196,7 +4194,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
"/navigation_controller/simple_page_2.html"));
NavigateFrameToURL(root->child_at(0), frame_url);
capturer.Wait();
- EXPECT_EQ(NAVIGATION_TYPE_NEW_SUBFRAME, capturer.details().type);
+ EXPECT_EQ(NavigationType::NEW_SUBFRAME, capturer.details().type);
}
{
@@ -4293,7 +4291,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
"/navigation_controller/simple_page_2.html"));
NavigateFrameToURL(root->child_at(0), frame_url);
capturer.Wait();
- EXPECT_EQ(NAVIGATION_TYPE_NEW_SUBFRAME, capturer.details().type);
+ EXPECT_EQ(NavigationType::NEW_SUBFRAME, capturer.details().type);
}
{
@@ -4464,7 +4462,7 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest, ReloadOriginalRequest) {
capturer.params().transition,
ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK |
ui::PAGE_TRANSITION_CLIENT_REDIRECT)));
- EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);
+ EXPECT_EQ(NavigationType::EXISTING_PAGE, capturer.details().type);
}
// Modify an entry in the session history and reload the original request.
« content/browser/frame_host/navigation_controller_impl.cc ('K') | « content/browser/frame_host/navigation_controller_impl.cc ('k') | content/browser/frame_host/navigation_controller_impl_unittest.cc » ('j') | content/public/browser/navigation_types.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698