Fix RenderFrameCreated and RenderFrameDeleted WebContentsObserver methods

content/browser/frame_host/frame_tree_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/frame_host/frame_tree.h"
 
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "content/browser/frame_host/navigator_impl.h"
 #include "content/browser/frame_host/render_frame_host_factory.h"
@@ skipping 51 matching lines @@
     return result;
   }
 
   // content::WebContentsObserver implementation.
   void RenderFrameCreated(RenderFrameHost* render_frame_host) override {
     LogWhatHappened("RenderFrameCreated", render_frame_host);
   }
 
   void RenderFrameHostChanged(RenderFrameHost* old_host,
                               RenderFrameHost* new_host) override {
+    // TODO(nasko): Re-enable this logging once RenderFrameHostChanged observer

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

I don't see these logging messages checked anywhere, so I'm not sure what breaks
if they're on.  Is there a need to disable them?  (Maybe they started showing up
in the logs when they didn't before?)

(If we do need this, let's list a bug number in the TODO.)

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

It starts showing up, which violates the expectations. Since this is for the
RenderFrameHostChanged, I want to disable it and fix it with the work of fixing
RenderFrameHostChanged itself.

+    // methods are fixed.
+    /*
     if (old_host)
       LogWhatHappened("RenderFrameChanged(old)", old_host);
     LogWhatHappened("RenderFrameChanged(new)", new_host);
+    */
   }
 
   void RenderFrameDeleted(RenderFrameHost* render_frame_host) override {
     LogWhatHappened("RenderFrameDeleted", render_frame_host);
   }
 
   void RenderProcessGone(base::TerminationStatus status) override {
     LogWhatHappened("RenderProcessGone");
   }
 
@@ skipping 137 matching lines @@
 // recovery from a render process crash.
 TEST_F(FrameTreeTest, ObserverWalksTreeAfterCrash) {
   TreeWalkingWebContentsLogger activity(contents());
 
   main_test_rfh()->OnCreateChildFrame(22, std::string(), SandboxFlags::NONE);
   EXPECT_EQ("RenderFrameCreated(22) -> 1: [22: []]", activity.GetLog());
   main_test_rfh()->OnCreateChildFrame(23, std::string(), SandboxFlags::NONE);
   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());
 }
 
 // Ensure that frames are not added to the tree, if the process passed in
 // is different than the process of the parent node.
 TEST_F(FrameTreeTest, FailAddFrameWithWrongProcessId) {
   FrameTree* frame_tree = contents()->GetFrameTree();
   FrameTreeNode* root = frame_tree->root();
   int process_id = root->current_frame_host()->GetProcess()->GetID();
 
   ASSERT_EQ("1: []", GetTreeState(frame_tree));
 
   // Simulate attaching a frame from mismatched process id.
   ASSERT_FALSE(frame_tree->AddFrame(root, process_id + 1, 1, std::string()));
   ASSERT_EQ("1: []", GetTreeState(frame_tree));
 }
 
 }  // namespace content