Fix RenderFrameCreated and RenderFrameDeleted WebContentsObserver methods

content/browser/frame_host/render_frame_host_manager.cc

Index: content/browser/frame_host/render_frame_host_manager.cc
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
index 0cd3b53b3c42c4eed16da2eba5360ecbc65d8a34..043bcec8a083d31e2f02b8e9adf8b2aab8f16def 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -87,6 +87,10 @@ RenderFrameHostManager::~RenderFrameHostManager() {
   // the current RenderFrameHost and uses it during its destructor.
   STLDeleteValues(&proxy_hosts_);
 
+  // Release the WebUI prior to resetting the current RenderFrameHost, as it

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

"it accesses it" is ambiguous.  (I think it means "as the WebUI accesses the
RenderFrameHost"?)

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

Done.

+  // accesses it during WebUI cleanup.
+  web_ui_.reset();
+
   // We should always have a current RenderFrameHost except in some tests.
   SetRenderFrameHost(scoped_ptr<RenderFrameHostImpl>());
 }
@@ -1411,13 +1415,6 @@ scoped_ptr<RenderFrameHostImpl> RenderFrameHostManager::CreateRenderFrame(
     if (success) {
       if (view_routing_id_ptr)
         *view_routing_id_ptr = render_view_host->GetRoutingID();
-
-      // A brand new RenderFrame was created by one of the Init calls above.
-      // Announce it to observers.
-      if (swapped_out)
-        render_frame_delegate_->RenderFrameCreated(proxy->render_frame_host());
-      else
-        render_frame_delegate_->RenderFrameCreated(new_render_frame_host.get());

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

Woo hoo!  Glad to see these calls move within RFH.

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

Acknowledged.

     }
   }