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

Unified Diff: content/browser/frame_host/render_frame_host_manager_unittest.cc

Issue 1189413005: Fix race when reloading original URL (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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/browser/frame_host/render_frame_host_manager.cc ('k') | testing/buildbot/chromium.fyi.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/frame_host/render_frame_host_manager_unittest.cc
diff --git a/content/browser/frame_host/render_frame_host_manager_unittest.cc b/content/browser/frame_host/render_frame_host_manager_unittest.cc
index ad04a4aaea109f28f645da75bd33fb3a0b54188b..79a2c58734c3fa84d649da27378192b78ef9182c 100644
--- a/content/browser/frame_host/render_frame_host_manager_unittest.cc
+++ b/content/browser/frame_host/render_frame_host_manager_unittest.cc
@@ -423,7 +423,8 @@ class RenderFrameHostManagerTest : public RenderViewHostImplTestHarness {
switches::kEnableBrowserSideNavigation)) {
scoped_ptr<NavigationRequest> navigation_request =
NavigationRequest::CreateBrowserInitiated(
- manager->frame_tree_node_, *frame_entry, entry,
+ manager->frame_tree_node_, frame_entry->url(),
+ frame_entry->referrer(), *frame_entry, entry,
FrameMsg_Navigate_Type::NORMAL, false, base::TimeTicks::Now(),
static_cast<NavigationControllerImpl*>(&controller()));
TestRenderFrameHost* frame_host = static_cast<TestRenderFrameHost*>(
@@ -433,7 +434,7 @@ class RenderFrameHostManagerTest : public RenderViewHostImplTestHarness {
return frame_host;
}
- return manager->Navigate(*frame_entry, entry);
+ return manager->Navigate(frame_entry->url(), *frame_entry, entry);
}
// Returns the pending RenderFrameHost.
« no previous file with comments | « content/browser/frame_host/render_frame_host_manager.cc ('k') | testing/buildbot/chromium.fyi.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698