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

Unified Diff: content/test/test_render_frame_host.cc

Issue 869533004: Fix WCO::RenderFrameCreated and WCO::RenderFrameDeleted notifications. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes for RenderFrameHostChanged. Created 5 years, 10 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/renderer/render_view_impl.cc ('k') | content/test/test_web_contents.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 d629a9e92608209195883a9c491101909dcd9286..bcaea3c493b4f94b3ae019d75e60b4a193bbddbb 100644
--- a/content/test/test_render_frame_host.cc
+++ b/content/test/test_render_frame_host.cc
@@ -54,9 +54,13 @@ 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() {}
+TestRenderFrameHost::~TestRenderFrameHost() {
+ SetRenderFrameCreated(false);
+}
TestRenderViewHost* TestRenderFrameHost::GetRenderViewHost() {
return static_cast<TestRenderViewHost*>(
@@ -107,6 +111,11 @@ void TestRenderFrameHost::SendNavigateWithTransitionAndResponseCode(
// DidStartProvisionalLoad may delete the pending entry that holds |url|,
// so we keep a copy of it to use in SendNavigateWithParameters.
GURL url_copy(url);
+
+ // Ensure that the RenderFrameCreated notification has been sent to observers
+ // before navigating the frame.
+ SetRenderFrameCreated(true);
+
OnDidStartProvisionalLoadForFrame(url_copy, false);
SendNavigateWithParameters(page_id, url_copy, transition, url_copy,
response_code, 0, std::vector<GURL>());
@@ -116,6 +125,10 @@ void TestRenderFrameHost::SendNavigateWithOriginalRequestURL(
int page_id,
const GURL& url,
const GURL& original_request_url) {
+ // Ensure that the RenderFrameCreated notification has been sent to observers
+ // before navigating the frame.
+ SetRenderFrameCreated(true);
+
OnDidStartProvisionalLoadForFrame(url, false);
SendNavigateWithParameters(page_id, url, ui::PAGE_TRANSITION_LINK,
original_request_url, 200, 0, std::vector<GURL>());
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | content/test/test_web_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698