| Index: content/browser/frame_host/render_frame_host_manager_browsertest.cc
|
| diff --git a/content/browser/frame_host/render_frame_host_manager_browsertest.cc b/content/browser/frame_host/render_frame_host_manager_browsertest.cc
|
| index fcf00e8fc0ffb979faf2f9f9a9dfa91cda1aaaaa..8d3918c26b6948c4e35ac334ba568fef43c82ff6 100644
|
| --- a/content/browser/frame_host/render_frame_host_manager_browsertest.cc
|
| +++ b/content/browser/frame_host/render_frame_host_manager_browsertest.cc
|
| @@ -1007,8 +1007,7 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest, ClickLinkAfter204Error) {
|
| EXPECT_EQ(orig_site_instance, post_nav_site_instance);
|
| EXPECT_EQ("/nocontent",
|
| shell()->web_contents()->GetVisibleURL().path());
|
| - EXPECT_FALSE(
|
| - shell()->web_contents()->GetController().GetLastCommittedEntry());
|
| + EXPECT_TRUE(shell()->web_contents()->GetController().IsInitialNavigation());
|
|
|
| // Renderer-initiated navigations should work.
|
| base::string16 expected_title = ASCIIToUTF16("Title Of Awesomeness");
|
| @@ -1076,7 +1075,9 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest, ShowLoadingURLUntilSpoof) {
|
| // At this point, we should no longer be showing the destination URL.
|
| // The visible entry should be null, resulting in about:blank in the address
|
| // bar.
|
| - EXPECT_FALSE(contents->GetController().GetVisibleEntry());
|
| + EXPECT_FALSE(contents->GetController().GetPendingEntry());
|
| + EXPECT_EQ(GURL(url::kAboutBlankURL),
|
| + contents->GetController().GetVisibleEntry()->GetURL());
|
| }
|
|
|
| // Test for crbug.com/9682. We should not show the URL for a pending renderer-
|
| @@ -1109,9 +1110,16 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
|
|
|
| // Ensure the destination URL is not visible, because it is not the initial
|
| // navigation.
|
| + // TODO(creis): It is, right?
|
| WebContents* contents = new_shell->web_contents();
|
| EXPECT_FALSE(contents->GetController().IsInitialNavigation());
|
| - EXPECT_FALSE(contents->GetController().GetVisibleEntry());
|
| +
|
| + // TODO(creis): There's definitely a regression right now, since we're not
|
| + // receiving DidAccessInitialDocument. Can we verify that happens, and then
|
| + // check that the omnibox shows about:blank?
|
| + EXPECT_FALSE(contents->GetController().GetPendingEntry());
|
| + EXPECT_EQ(GURL(url::kAboutBlankURL),
|
| + contents->GetController().GetVisibleEntry()->GetURL());
|
| }
|
|
|
| // Crashes under ThreadSanitizer, http://crbug.com/356758.
|
| @@ -1314,8 +1322,9 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
|
| // view-source URL, we create a new SiteInstance.
|
| RenderViewHost* blank_rvh = shell()->web_contents()->GetRenderViewHost();
|
| SiteInstance* blank_site_instance = blank_rvh->GetSiteInstance();
|
| - EXPECT_EQ(shell()->web_contents()->GetLastCommittedURL(), GURL::EmptyGURL());
|
| - EXPECT_EQ(blank_site_instance->GetSiteURL(), GURL::EmptyGURL());
|
| + EXPECT_EQ(GURL(url::kAboutBlankURL),
|
| + shell()->web_contents()->GetLastCommittedURL());
|
| + EXPECT_EQ(GURL::EmptyGURL(), blank_site_instance->GetSiteURL());
|
| rvh_observers.EnsureRVHGetsDestructed(blank_rvh);
|
|
|
| // Now navigate to the view-source URL and ensure we got a different
|
|
|