| 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..895d927b5c1886a253c099aabfc71aca4eb6f611 100644
|
| --- a/content/renderer/render_view_browsertest.cc
|
| +++ b/content/renderer/render_view_browsertest.cc
|
| @@ -1998,7 +1998,7 @@ TEST_F(RenderViewImplTest, RendererNavigationStartTransmittedToBrowser) {
|
|
|
| FrameHostMsg_DidStartProvisionalLoad::Param host_nav_params =
|
| ProcessAndReadIPC<FrameHostMsg_DidStartProvisionalLoad>();
|
| - base::TimeTicks transmitted_start = std::get<1>(host_nav_params);
|
| + base::TimeTicks transmitted_start = std::get<2>(host_nav_params);
|
| EXPECT_FALSE(transmitted_start.is_null());
|
| EXPECT_LE(lower_bound_navigation_start, transmitted_start);
|
| }
|
| @@ -2014,7 +2014,7 @@ TEST_F(RenderViewImplTest, BrowserNavigationStart) {
|
| RequestNavigationParams());
|
| FrameHostMsg_DidStartProvisionalLoad::Param nav_params =
|
| ProcessAndReadIPC<FrameHostMsg_DidStartProvisionalLoad>();
|
| - EXPECT_EQ(common_params.navigation_start, std::get<1>(nav_params));
|
| + EXPECT_EQ(common_params.navigation_start, std::get<2>(nav_params));
|
| }
|
|
|
| // Sanity check for the Navigation Timing API |navigationStart| override. We
|
| @@ -2054,9 +2054,9 @@ TEST_F(RenderViewImplTest, NavigationStartWhenInitialDocumentWasAccessed) {
|
| FrameHostMsg_DidStartProvisionalLoad::Param nav_params =
|
| ProcessAndReadIPC<FrameHostMsg_DidStartProvisionalLoad>();
|
| if (!IsBrowserSideNavigationEnabled())
|
| - EXPECT_GT(std::get<1>(nav_params), common_params.navigation_start);
|
| + EXPECT_GT(std::get<2>(nav_params), common_params.navigation_start);
|
| else
|
| - EXPECT_EQ(common_params.navigation_start, std::get<1>(nav_params));
|
| + EXPECT_EQ(common_params.navigation_start, std::get<2>(nav_params));
|
| }
|
|
|
| TEST_F(RenderViewImplTest, NavigationStartForReload) {
|
| @@ -2083,11 +2083,11 @@ TEST_F(RenderViewImplTest, NavigationStartForReload) {
|
| if (!IsBrowserSideNavigationEnabled()) {
|
| // The browser navigation_start should not be used because beforeunload was
|
| // fired during Navigate.
|
| - EXPECT_PRED2(TimeTicksGT, std::get<1>(host_nav_params),
|
| + EXPECT_PRED2(TimeTicksGT, std::get<2>(host_nav_params),
|
| common_params.navigation_start);
|
| } else {
|
| // PlzNavigate: the browser navigation_start is always used.
|
| - EXPECT_EQ(common_params.navigation_start, std::get<1>(host_nav_params));
|
| + EXPECT_EQ(common_params.navigation_start, std::get<2>(host_nav_params));
|
| }
|
| }
|
|
|
| @@ -2112,12 +2112,12 @@ TEST_F(RenderViewImplTest, NavigationStartForSameProcessHistoryNavigation) {
|
| if (!IsBrowserSideNavigationEnabled()) {
|
| // The browser navigation_start should not be used because beforeunload was
|
| // fired during GoToOffsetWithParams.
|
| - EXPECT_PRED2(TimeTicksGT, std::get<1>(host_nav_params),
|
| + EXPECT_PRED2(TimeTicksGT, std::get<2>(host_nav_params),
|
| common_params_back.navigation_start);
|
| } else {
|
| // PlzNavigate: the browser navigation_start is always used.
|
| EXPECT_EQ(common_params_back.navigation_start,
|
| - std::get<1>(host_nav_params));
|
| + std::get<2>(host_nav_params));
|
| }
|
| render_thread_->sink().ClearMessages();
|
|
|
| @@ -2131,11 +2131,11 @@ TEST_F(RenderViewImplTest, NavigationStartForSameProcessHistoryNavigation) {
|
| FrameHostMsg_DidStartProvisionalLoad::Param host_nav_params2 =
|
| ProcessAndReadIPC<FrameHostMsg_DidStartProvisionalLoad>();
|
| if (!IsBrowserSideNavigationEnabled()) {
|
| - EXPECT_PRED2(TimeTicksGT, std::get<1>(host_nav_params2),
|
| + EXPECT_PRED2(TimeTicksGT, std::get<2>(host_nav_params2),
|
| common_params_forward.navigation_start);
|
| } else {
|
| EXPECT_EQ(common_params_forward.navigation_start,
|
| - std::get<1>(host_nav_params2));
|
| + std::get<2>(host_nav_params2));
|
| }
|
| }
|
|
|
| @@ -2154,7 +2154,7 @@ TEST_F(RenderViewImplTest, NavigationStartForCrossProcessHistoryNavigation) {
|
|
|
| FrameHostMsg_DidStartProvisionalLoad::Param host_nav_params =
|
| ProcessAndReadIPC<FrameHostMsg_DidStartProvisionalLoad>();
|
| - EXPECT_EQ(std::get<1>(host_nav_params), common_params.navigation_start);
|
| + EXPECT_EQ(std::get<2>(host_nav_params), common_params.navigation_start);
|
| }
|
|
|
| TEST_F(RenderViewImplTest, PreferredSizeZoomed) {
|
|
|