Index: content/renderer/render_view_browsertest.cc |
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc |
index 3970bb9eae387ea0cd902b844d78ecbbb3635be9..261f4f5f5d1670ed568396bb723ee08bdedf5c7f 100644 |
--- a/content/renderer/render_view_browsertest.cc |
+++ b/content/renderer/render_view_browsertest.cc |
@@ -206,7 +206,7 @@ CommonNavigationParams MakeCommonNavigationParams( |
CommonNavigationParams params; |
params.url = GURL("data:text/html,<div>Page</div>"); |
params.navigation_start = base::TimeTicks::Now() + navigation_start_offset; |
- params.navigation_type = FrameMsg_Navigate_Type::NORMAL; |
+ params.navigation_type = FrameMsg_Navigate_Type::DIFFERENT_DOCUMENT; |
params.transition = ui::PAGE_TRANSITION_TYPED; |
return params; |
} |
@@ -605,7 +605,7 @@ TEST_F(RenderViewImplTest, OnNavigationHttpPost) { |
StartNavigationParams start_params; |
RequestNavigationParams request_params; |
common_params.url = GURL("data:text/html,<div>Page</div>"); |
- common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL; |
+ common_params.navigation_type = FrameMsg_Navigate_Type::DIFFERENT_DOCUMENT; |
common_params.transition = ui::PAGE_TRANSITION_TYPED; |
common_params.method = "POST"; |
@@ -646,7 +646,7 @@ TEST_F(RenderViewImplTest, OnNavigationHttpPost) { |
TEST_F(RenderViewImplTest, OnNavigationLoadDataWithBaseURL) { |
CommonNavigationParams common_params; |
common_params.url = GURL("data:text/html,"); |
- common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL; |
+ common_params.navigation_type = FrameMsg_Navigate_Type::DIFFERENT_DOCUMENT; |
common_params.transition = ui::PAGE_TRANSITION_TYPED; |
common_params.base_url_for_data_url = GURL("about:blank"); |
common_params.history_url_for_data_url = GURL("about:blank"); |
@@ -892,7 +892,7 @@ TEST_F(RenderViewImplTest, NavigateProxyAndDetachBeforeOnNavigate) { |
// replace the now-detached RenderFrameProxy. This shouldn't crash and |
// should abort the navigation, since the frame no longer exists. |
CommonNavigationParams common_params; |
- common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL; |
+ common_params.navigation_type = FrameMsg_Navigate_Type::DIFFERENT_DOCUMENT; |
common_params.url = GURL(url::kAboutBlankURL); |
provisional_frame->Navigate(common_params, StartNavigationParams(), |
RequestNavigationParams()); |
@@ -983,7 +983,8 @@ TEST_F(RenderViewImplTest, DISABLED_LastCommittedUpdateState) { |
// Go back to C and commit, preparing for our real test. |
CommonNavigationParams common_params_C; |
RequestNavigationParams request_params_C; |
- common_params_C.navigation_type = FrameMsg_Navigate_Type::NORMAL; |
+ common_params_C.navigation_type = |
+ FrameMsg_Navigate_Type::HISTORY_DIFFERENT_DOCUMENT; |
common_params_C.transition = ui::PAGE_TRANSITION_FORWARD_BACK; |
request_params_C.current_history_list_length = 4; |
request_params_C.current_history_list_offset = 3; |
@@ -1000,7 +1001,8 @@ TEST_F(RenderViewImplTest, DISABLED_LastCommittedUpdateState) { |
// Back to page B without committing. |
CommonNavigationParams common_params_B; |
RequestNavigationParams request_params_B; |
- common_params_B.navigation_type = FrameMsg_Navigate_Type::NORMAL; |
+ common_params_B.navigation_type = |
+ FrameMsg_Navigate_Type::HISTORY_DIFFERENT_DOCUMENT; |
common_params_B.transition = ui::PAGE_TRANSITION_FORWARD_BACK; |
request_params_B.current_history_list_length = 4; |
request_params_B.current_history_list_offset = 2; |
@@ -1011,7 +1013,8 @@ TEST_F(RenderViewImplTest, DISABLED_LastCommittedUpdateState) { |
// Back to page A and commit. |
CommonNavigationParams common_params; |
RequestNavigationParams request_params; |
- common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL; |
+ common_params.navigation_type = |
+ FrameMsg_Navigate_Type::HISTORY_DIFFERENT_DOCUMENT; |
common_params.transition = ui::PAGE_TRANSITION_FORWARD_BACK; |
request_params.current_history_list_length = 4; |
request_params.current_history_list_offset = 2; |
@@ -1351,7 +1354,7 @@ TEST_F(RenderViewImplTest, DISABLED_DidFailProvisionalLoadWithErrorForError) { |
// Start a load that will reach provisional state synchronously, |
// but won't complete synchronously. |
CommonNavigationParams common_params; |
- common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL; |
+ common_params.navigation_type = FrameMsg_Navigate_Type::DIFFERENT_DOCUMENT; |
common_params.url = GURL("data:text/html,test data"); |
frame()->Navigate(common_params, StartNavigationParams(), |
RequestNavigationParams()); |
@@ -1374,7 +1377,7 @@ TEST_F(RenderViewImplTest, DidFailProvisionalLoadWithErrorForCancellation) { |
// Start a load that will reach provisional state synchronously, |
// but won't complete synchronously. |
CommonNavigationParams common_params; |
- common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL; |
+ common_params.navigation_type = FrameMsg_Navigate_Type::DIFFERENT_DOCUMENT; |
common_params.url = GURL("data:text/html,test data"); |
frame()->Navigate(common_params, StartNavigationParams(), |
RequestNavigationParams()); |
@@ -1686,7 +1689,7 @@ TEST_F(RenderViewImplTest, NavigateSubframe) { |
CommonNavigationParams common_params; |
RequestNavigationParams request_params; |
common_params.url = GURL("data:text/html,world"); |
- common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL; |
+ common_params.navigation_type = FrameMsg_Navigate_Type::DIFFERENT_DOCUMENT; |
common_params.transition = ui::PAGE_TRANSITION_TYPED; |
common_params.navigation_start = base::TimeTicks::FromInternalValue(1); |
request_params.current_history_list_length = 1; |
@@ -1798,7 +1801,7 @@ TEST_F(RendererErrorPageTest, MAYBE_Suppresses) { |
// Start a load that will reach provisional state synchronously, |
// but won't complete synchronously. |
CommonNavigationParams common_params; |
- common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL; |
+ common_params.navigation_type = FrameMsg_Navigate_Type::DIFFERENT_DOCUMENT; |
common_params.url = GURL("data:text/html,test data"); |
TestRenderFrame* main_frame = static_cast<TestRenderFrame*>(frame()); |
main_frame->Navigate(common_params, StartNavigationParams(), |
@@ -1830,7 +1833,7 @@ TEST_F(RendererErrorPageTest, MAYBE_DoesNotSuppress) { |
// Start a load that will reach provisional state synchronously, |
// but won't complete synchronously. |
CommonNavigationParams common_params; |
- common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL; |
+ common_params.navigation_type = FrameMsg_Navigate_Type::DIFFERENT_DOCUMENT; |
common_params.url = GURL("data:text/html,test data"); |
TestRenderFrame* main_frame = static_cast<TestRenderFrame*>(frame()); |
main_frame->Navigate(common_params, StartNavigationParams(), |
@@ -1864,7 +1867,7 @@ TEST_F(RendererErrorPageTest, MAYBE_HttpStatusCodeErrorWithEmptyBody) { |
// Start a load that will reach provisional state synchronously, |
// but won't complete synchronously. |
CommonNavigationParams common_params; |
- common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL; |
+ common_params.navigation_type = FrameMsg_Navigate_Type::DIFFERENT_DOCUMENT; |
common_params.url = GURL("data:text/html,test data"); |
TestRenderFrame* main_frame = static_cast<TestRenderFrame*>(frame()); |
main_frame->Navigate(common_params, StartNavigationParams(), |
@@ -2113,6 +2116,8 @@ TEST_F(RenderViewImplTest, NavigationStartForSameProcessHistoryNavigation) { |
common_params_back.url = |
GURL("data:text/html;charset=utf-8,<div id=pagename>Page B</div>"); |
common_params_back.transition = ui::PAGE_TRANSITION_FORWARD_BACK; |
+ common_params_back.navigation_type = |
+ FrameMsg_Navigate_Type::HISTORY_DIFFERENT_DOCUMENT; |
GoToOffsetWithParams(-1, back_state, common_params_back, |
StartNavigationParams(), RequestNavigationParams()); |
FrameHostMsg_DidStartProvisionalLoad::Param host_nav_params = |
@@ -2134,6 +2139,8 @@ TEST_F(RenderViewImplTest, NavigationStartForSameProcessHistoryNavigation) { |
common_params_forward.url = |
GURL("data:text/html;charset=utf-8,<div id=pagename>Page C</div>"); |
common_params_forward.transition = ui::PAGE_TRANSITION_FORWARD_BACK; |
+ common_params_forward.navigation_type = |
+ FrameMsg_Navigate_Type::HISTORY_DIFFERENT_DOCUMENT; |
GoToOffsetWithParams(1, forward_state, common_params_forward, |
StartNavigationParams(), RequestNavigationParams()); |
FrameHostMsg_DidStartProvisionalLoad::Param host_nav_params2 = |
@@ -2150,6 +2157,8 @@ TEST_F(RenderViewImplTest, NavigationStartForSameProcessHistoryNavigation) { |
TEST_F(RenderViewImplTest, NavigationStartForCrossProcessHistoryNavigation) { |
auto common_params = MakeCommonNavigationParams(-TimeDelta::FromSeconds(1)); |
common_params.transition = ui::PAGE_TRANSITION_FORWARD_BACK; |
+ common_params.navigation_type = |
+ FrameMsg_Navigate_Type::HISTORY_DIFFERENT_DOCUMENT; |
RequestNavigationParams request_params; |
request_params.page_state = |