Index: content/test/test_render_frame_host.cc |
diff --git a/content/test/test_render_frame_host.cc b/content/test/test_render_frame_host.cc |
index 8b444ad9ae3a591fea3fe9f47ae7775826d2e069..d347c104e272167aa6e6cb6c1543c9a0c3b289ad 100644 |
--- a/content/test/test_render_frame_host.cc |
+++ b/content/test/test_render_frame_host.cc |
@@ -55,12 +55,9 @@ TestRenderFrameHost::TestRenderFrameHost(SiteInstance* site_instance, |
child_creation_observer_(delegate ? delegate->GetAsWebContents() : NULL), |
contents_mime_type_("text/html"), |
simulate_history_list_was_cleared_(false) { |
- if (frame_tree_node_->IsMainFrame()) |
- SetRenderFrameCreated(true); |
} |
TestRenderFrameHost::~TestRenderFrameHost() { |
- SetRenderFrameCreated(false); |
} |
TestRenderViewHost* TestRenderFrameHost::GetRenderViewHost() { |
@@ -134,7 +131,7 @@ void TestRenderFrameHost::SendNavigateWithTransitionAndResponseCode( |
// Ensure that the RenderFrameCreated notification has been sent to observers |
// before navigating the frame. |
- SetRenderFrameCreated(true); |
+ //SetRenderFrameCreated(true); |
ncarter (slow)
2015/05/26 21:44:14
Seems like debug cruft?
nasko
2015/05/26 22:25:49
Yes, indeed.
|
OnDidStartProvisionalLoadForFrame(url_copy); |
SendNavigateWithParameters(page_id, nav_entry_id, did_create_new_entry, |
@@ -150,7 +147,7 @@ void TestRenderFrameHost::SendNavigateWithOriginalRequestURL( |
const GURL& original_request_url) { |
// Ensure that the RenderFrameCreated notification has been sent to observers |
// before navigating the frame. |
- SetRenderFrameCreated(true); |
+ //SetRenderFrameCreated(true); |
ncarter (slow)
2015/05/26 21:44:14
Same here.
nasko
2015/05/26 22:25:49
Done.
|
OnDidStartProvisionalLoadForFrame(url); |
SendNavigateWithParameters(page_id, nav_entry_id, did_create_new_entry, url, |
@@ -245,6 +242,10 @@ void TestRenderFrameHost::NavigateAndCommitRendererInitiated( |
void TestRenderFrameHost::SendRendererInitiatedNavigationRequest( |
const GURL& url, |
bool has_user_gesture) { |
+ // Since this is renderer-initiated navigation, the RenderFrame must be |
+ // initialized. Do it if it hasn't happened yet. |
+ InitializeRenderFrameIfNeeded(); |
ncarter (slow)
2015/05/26 21:44:14
This is very reasonable.
nasko
2015/05/26 22:25:49
Awesome!
|
+ |
if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
switches::kEnableBrowserSideNavigation)) { |
BeginNavigationParams begin_params("GET", std::string(), net::LOAD_NORMAL, |
@@ -262,6 +263,13 @@ void TestRenderFrameHost::DidDisownOpener() { |
OnDidDisownOpener(); |
} |
+void TestRenderFrameHost::InitializeRenderFrameIfNeeded() { |
+ if (!render_view_host()->IsRenderViewLive()) { |
+ RenderViewHostTester::For(render_view_host())->CreateRenderView( |
+ base::string16(), MSG_ROUTING_NONE, MSG_ROUTING_NONE, -1, false); |
+ } |
+} |
+ |
void TestRenderFrameHost::PrepareForCommit() { |
PrepareForCommitWithServerRedirect(GURL()); |
} |