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

Unified Diff: content/public/test/render_view_test.cc

Issue 1018383002: Make NavigationParams clearer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase + addressed comment Created 5 years, 9 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
Index: content/public/test/render_view_test.cc
diff --git a/content/public/test/render_view_test.cc b/content/public/test/render_view_test.cc
index f0e0f8c011d0b1f33a6ab6abae4c8a770c130afc..c8e488ddd73cd96710a42e1ba3239d9aacab499d 100644
--- a/content/public/test/render_view_test.cc
+++ b/content/public/test/render_view_test.cc
@@ -368,8 +368,7 @@ void RenderViewTest::Reload(const GURL& url) {
GURL(), GURL());
RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_);
impl->GetMainRenderFrame()->OnNavigate(common_params, StartNavigationParams(),
- CommitNavigationParams(),
- HistoryNavigationParams());
+ RequestNavigationParams());
FrameLoadWaiter(impl->GetMainRenderFrame()).Wait();
}
@@ -447,13 +446,15 @@ void RenderViewTest::GoToOffset(int offset, const PageState& state) {
GURL(), Referrer(), ui::PAGE_TRANSITION_FORWARD_BACK,
FrameMsg_Navigate_Type::NORMAL, true, base::TimeTicks(),
FrameMsg_UILoadMetricsReportType::NO_REPORT, GURL(), GURL());
- HistoryNavigationParams history_params(
- state, impl->page_id_ + offset, pending_offset,
- impl->history_list_offset_, history_list_length, false);
+ RequestNavigationParams request_params;
+ request_params.page_state = state;
+ request_params.page_id = impl->page_id_ + offset;
+ request_params.pending_history_list_offset = pending_offset;
+ request_params.current_history_list_offset = impl->history_list_offset_;
+ request_params.current_history_list_length = history_list_length;
impl->GetMainRenderFrame()->OnNavigate(common_params, StartNavigationParams(),
- CommitNavigationParams(),
- history_params);
+ request_params);
// The load actually happens asynchronously, so we pump messages to process
// the pending continuation.
« no previous file with comments | « content/common/navigation_params.cc ('k') | content/renderer/accessibility/renderer_accessibility_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698