Fix RenderFrameCreated and RenderFrameDeleted WebContentsObserver methods

content/test/test_render_frame_host.cc

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);

[Charlie Reis, 2015/02/12 00:29:31]

Should this call go in SendNavigateWithParameters, which is called here, below,
and by SendNavigateWithFile?

[nasko, 2015/02/12 17:52:26]

It should stay before calls to OnDidStartProvisionalLoadForFrame, which sends an
observer notification. If the frame didn't notify for creation, the
DidStartProvisionalLoad will assert.

+
   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>());