Revert of Revert of Set frame liveness before calling RenderFrameCreated/RenderFrameDeleted.

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 11 matching lines @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
 namespace {
 
 // Appends a description of the structure of the frame tree to |result|.
 void AppendTreeNodeState(FrameTreeNode* node, std::string* result) {
   result->append(
       base::Int64ToString(node->current_frame_host()->GetRoutingID()));
+  if (!node->current_frame_host()->IsRenderFrameLive())
+    result->append("*");  // Asterisk next to dead frames.
+
   if (!node->frame_name().empty()) {
     result->append(" '");
     result->append(node->frame_name());
     result->append("'");
   }
   result->append(": [");
   const char* separator = "";
   for (size_t i = 0; i < node->child_count(); i++) {
     result->append(separator);
     AppendTreeNodeState(node->child_at(i), result);
@@ skipping 153 matching lines @@
                 "16: [264: [], 266: [], "
                      "267 'node with deep subtree': "
                          "[365: [455: []]], 268: []]]",
             GetTreeState(frame_tree));
 }
 
 // Do some simple manipulations of the frame tree, making sure that
 // WebContentsObservers see a consistent view of the tree as we go.
 TEST_F(FrameTreeTest, ObserverWalksTreeDuringFrameCreation) {
   TreeWalkingWebContentsLogger activity(contents());
+  contents()->NavigateAndCommit(GURL("http://www.google.com"));
+  EXPECT_EQ("", activity.GetLog());
+
   FrameTree* frame_tree = contents()->GetFrameTree();
   FrameTreeNode* root = frame_tree->root();
 
-  EXPECT_EQ("", activity.GetLog());
-
   // Simulate attaching a series of frames to build the frame tree.
   main_test_rfh()->OnCreateChildFrame(14, std::string(), SandboxFlags::NONE);
   EXPECT_EQ(
       "RenderFrameHostChanged(new)(14) -> 1: []\n"
       "RenderFrameCreated(14) -> 1: [14: []]",
       activity.GetLog());
   main_test_rfh()->OnCreateChildFrame(18, std::string(), SandboxFlags::NONE);
   EXPECT_EQ(
       "RenderFrameHostChanged(new)(18) -> 1: [14: []]\n"
       "RenderFrameCreated(18) -> 1: [14: [], 18: []]",
       activity.GetLog());
   frame_tree->RemoveFrame(root->child_at(0));
   EXPECT_EQ("RenderFrameDeleted(14) -> 1: [18: []]", activity.GetLog());
   frame_tree->RemoveFrame(root->child_at(0));
   EXPECT_EQ("RenderFrameDeleted(18) -> 1: []", activity.GetLog());
 }
 
 // Make sure that WebContentsObservers see a consistent view of the tree after
 // recovery from a render process crash.
 TEST_F(FrameTreeTest, ObserverWalksTreeAfterCrash) {
   TreeWalkingWebContentsLogger activity(contents());
+  contents()->NavigateAndCommit(GURL("http://www.google.com"));
+  EXPECT_EQ("", activity.GetLog());
 
   main_test_rfh()->OnCreateChildFrame(22, std::string(), SandboxFlags::NONE);
   EXPECT_EQ(
       "RenderFrameHostChanged(new)(22) -> 1: []\n"
       "RenderFrameCreated(22) -> 1: [22: []]",
       activity.GetLog());
   main_test_rfh()->OnCreateChildFrame(23, std::string(), SandboxFlags::NONE);
   EXPECT_EQ(
       "RenderFrameHostChanged(new)(23) -> 1: [22: []]\n"
       "RenderFrameCreated(23) -> 1: [22: [], 23: []]",
       activity.GetLog());
 
   // Crash the renderer
   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) {
+  contents()->NavigateAndCommit(GURL("http://www.google.com"));
   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));
 }
@@ skipping 23 matching lines @@
   main_test_rfh()->OnMessageReceived(FrameHostMsg_RenderProcessGone(
       0, base::TERMINATION_STATUS_PROCESS_CRASHED, -1));
 
   // Ensure they cannot be found by id after the process has crashed.
   EXPECT_FALSE(FrameTreeNode::GloballyFindByID(id1));
   EXPECT_FALSE(FrameTreeNode::GloballyFindByID(id2));
   EXPECT_FALSE(FrameTreeNode::GloballyFindByID(id3));
 }
 
 }  // namespace content