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

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

Issue 248013003: Remove WebHistoryItem child usage (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: moar comments Created 6 years, 8 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/public/test/render_view_test.h ('k') | content/renderer/context_menu_params_builder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 33c0fdb93cefd30bf1c3e4ed7a526e9b3279e578..994c7be4ebc6a8fa14f2a82853ba1200d5c019d6 100644
--- a/content/public/test/render_view_test.cc
+++ b/content/public/test/render_view_test.cc
@@ -125,17 +125,18 @@ void RenderViewTest::LoadHTML(const char* html) {
ProcessPendingMessages();
}
-void RenderViewTest::GoBack(const blink::WebHistoryItem& item) {
- GoToOffset(-1, item);
+void RenderViewTest::GoBack(const PageState& state) {
+ GoToOffset(-1, state);
}
-void RenderViewTest::GoForward(const blink::WebHistoryItem& item) {
- GoToOffset(1, item);
+void RenderViewTest::GoForward(const PageState& state) {
+ GoToOffset(1, state);
}
void RenderViewTest::GoBackToPrevious() {
RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_);
- GoBack(impl->history_controller()->GetPreviousItemForExport());
+ GoBack(HistoryEntryToPageState(
+ impl->history_controller()->GetPreviousEntry()));
}
void RenderViewTest::SetUp() {
@@ -400,8 +401,7 @@ ContentRendererClient* RenderViewTest::CreateContentRendererClient() {
return new ContentRendererClient;
}
-void RenderViewTest::GoToOffset(int offset,
- const blink::WebHistoryItem& history_item) {
+void RenderViewTest::GoToOffset(int offset, const PageState& state) {
RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_);
int history_list_length = impl->historyBackListCount() +
@@ -415,7 +415,7 @@ void RenderViewTest::GoToOffset(int offset,
navigate_params.current_history_list_offset = impl->history_list_offset();
navigate_params.pending_history_list_offset = pending_offset;
navigate_params.page_id = impl->GetPageId() + offset;
- navigate_params.page_state = HistoryItemToPageState(history_item);
+ navigate_params.page_state = state;
navigate_params.request_time = base::Time::Now();
FrameMsg_Navigate navigate_message(impl->main_render_frame()->GetRoutingID(),
« no previous file with comments | « content/public/test/render_view_test.h ('k') | content/renderer/context_menu_params_builder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698