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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/renderer/render_view_browsertest.cc

Issue 2584513003: PlzNavigate: identify same-page browser-initiated navigation. (Closed)
Patch Set: Rebase. 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 | « content/renderer/render_frame_impl_browsertest.cc ('k') | content/test/test_render_frame_host.cc » ('j') | url/gurl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_browsertest.cc
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
index e90b01510a84a5881bbb34ffc668e1fdcc6c80d8..31b00e7d418545bf91b698dbb3f654ed93730e46 100644
--- a/content/renderer/render_view_browsertest.cc
+++ b/content/renderer/render_view_browsertest.cc
@@ -205,7 +205,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;
}
@@ -602,7 +602,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";
@@ -643,7 +643,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");
@@ -970,7 +970,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;
@@ -988,7 +989,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;
@@ -1000,7 +1002,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;
@@ -1343,7 +1346,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());
@@ -1366,7 +1369,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());
@@ -1678,7 +1681,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;
@@ -1790,7 +1793,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(),
@@ -1822,7 +1825,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(),
@@ -1856,7 +1859,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(),
@@ -2105,6 +2108,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 =
@@ -2126,6 +2131,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 =
@@ -2142,6 +2149,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 =
« no previous file with comments | « content/renderer/render_frame_impl_browsertest.cc ('k') | content/test/test_render_frame_host.cc » ('j') | url/gurl.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698