Fix RenderFrameCreated and RenderFrameDeleted WebContentsObserver methods

content/browser/frame_host/frame_tree_unittest.cc

Index: content/browser/frame_host/frame_tree_unittest.cc
diff --git a/content/browser/frame_host/frame_tree_unittest.cc b/content/browser/frame_host/frame_tree_unittest.cc
index 6ee69fc52b7e1bbc8e8d7bb9048e0324e637a03a..dcc8f39ab1754556831b790a5e2f3156705c617d 100644
--- a/content/browser/frame_host/frame_tree_unittest.cc
+++ b/content/browser/frame_host/frame_tree_unittest.cc
@@ -69,9 +69,13 @@ class TreeWalkingWebContentsLogger : public WebContentsObserver {
 
   void RenderFrameHostChanged(RenderFrameHost* old_host,
                               RenderFrameHost* new_host) override {
+    // TODO(nasko): Re-enable this logging once RenderFrameHostChanged observer
+    // methods are fixed. See https://crbug.com/450799

[Charlie Reis, 2015/02/12 23:51:26]

nit: End with period.

[nasko, 2015/02/13 00:18:51]

Done.

+    /*
     if (old_host)
       LogWhatHappened("RenderFrameChanged(old)", old_host);
     LogWhatHappened("RenderFrameChanged(new)", new_host);
+    */
   }
 
   void RenderFrameDeleted(RenderFrameHost* render_frame_host) override {
@@ -229,11 +233,13 @@ TEST_F(FrameTreeTest, ObserverWalksTreeAfterCrash) {
   EXPECT_EQ("RenderFrameCreated(23) -> 1: [22: [], 23: []]", activity.GetLog());
 
   // Crash the renderer
-  main_rfh()->OnMessageReceived(FrameHostMsg_RenderProcessGone(
-      0, base::TERMINATION_STATUS_PROCESS_CRASHED, -1));
+  main_test_rfh()->OnMessageReceived(FrameHostMsg_RenderProcessGone(
+      main_test_rfh()->GetRoutingID(), base::TERMINATION_STATUS_PROCESS_CRASHED,
+      -1));
   EXPECT_EQ(
       "RenderFrameDeleted(22) -> 1: []\n"
       "RenderFrameDeleted(23) -> 1: []\n"
+      "RenderFrameDeleted(1) -> 1: []\n"
       "RenderProcessGone -> 1: []",
       activity.GetLog());
 }