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

Unified Diff: content/browser/web_contents/web_contents_impl_unittest.cc

Issue 1777903003: Ensure the NavigationHandle's nav entry ID is updated during transfers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move fix to another CL (now cleanup only) Created 4 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/browser/web_contents/web_contents_impl_unittest.cc
diff --git a/content/browser/web_contents/web_contents_impl_unittest.cc b/content/browser/web_contents/web_contents_impl_unittest.cc
index e95c85363ff3e073e3d6f7cd00e434156e73086d..e16934349c12aae445038a3e7173bf79c44962d2 100644
--- a/content/browser/web_contents/web_contents_impl_unittest.cc
+++ b/content/browser/web_contents/web_contents_impl_unittest.cc
@@ -354,12 +354,15 @@ class FakeValidationMessageDelegate : public WebContentsDelegate {
TEST_F(WebContentsImplTest, UpdateTitle) {
NavigationControllerImpl& cont =
static_cast<NavigationControllerImpl&>(controller());
+ cont.LoadURL(GURL(url::kAboutBlankURL), Referrer(), ui::PAGE_TRANSITION_TYPED,
+ std::string());
+
FrameHostMsg_DidCommitProvisionalLoad_Params params;
InitNavigateParams(&params, 0, 0, true, GURL(url::kAboutBlankURL),
ui::PAGE_TRANSITION_TYPED);
- LoadCommittedDetails details;
- cont.RendererDidNavigate(contents()->GetMainFrame(), params, &details);
+ contents()->GetMainFrame()->PrepareForCommit();
+ contents()->GetMainFrame()->SendNavigateWithParams(&params);
contents()->UpdateTitle(contents()->GetMainFrame(), 0,
base::ASCIIToUTF16(" Lots O' Whitespace\n"),
@@ -421,8 +424,8 @@ TEST_F(WebContentsImplTest, NTPViewSource) {
FrameHostMsg_DidCommitProvisionalLoad_Params params;
InitNavigateParams(&params, 0, entry_id, true, kGURL,
ui::PAGE_TRANSITION_TYPED);
- LoadCommittedDetails details;
- cont.RendererDidNavigate(contents()->GetMainFrame(), params, &details);
+ contents()->GetMainFrame()->PrepareForCommit();
+ contents()->GetMainFrame()->SendNavigateWithParams(&params);
// Also check title and url.
EXPECT_EQ(base::ASCIIToUTF16(kUrl), contents()->GetTitle());
}

Powered by Google App Engine
This is Rietveld 408576698