Resetting FrameTreeNode must remove child FrameTreeNodes from global map.

content/browser/frame_host/frame_tree_node.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_node.h"
 
 #include <queue>
 
 #include "base/command_line.h"
 #include "base/stl_util.h"
@@ skipping 25 matching lines @@
       parent_(NULL),
       replication_state_(name),
       is_loading_(false) {
 }
 
 FrameTreeNode::~FrameTreeNode() {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableBrowserSideNavigation)) {
     navigator_->CancelNavigation(this);
   }
+  frame_tree_->RemoveNodeFromMap(frame_tree_node_id_);

[Charlie Reis, 2015/02/12 17:12:43]

Why not frame_tree->RemoveFrame(this)?  I'm guessing that we're missing the
FrameDeleted notification in this case as well, and RemoveFrame would handle
that.

(We may have to skip that call for the main frame, based on the NOTREACHED in
Remove Frame.)

[nasko, 2015/02/12 23:21:08]

Done.

 }
 
 bool FrameTreeNode::IsMainFrame() const {
   return frame_tree_->root() == this;
 }
 
 void FrameTreeNode::AddChild(scoped_ptr<FrameTreeNode> child,
                              int process_id,
                              int frame_routing_id) {
   // Child frame must always be created in the same process as the parent.
@@ skipping 45 matching lines @@
 
   for (FrameTreeNode* node = parent(); node; node = node->parent()) {
     if (node == other)
       return true;
   }
 
   return false;
 }
 
 }  // namespace content