Fix bug where removed (but not deleted) windows are not reflected in the tree properly

ash/common/devtools/ash_devtools_unittest.cc

 // Copyright 2016 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 "ash/common/devtools/ash_devtools_dom_agent.h"
 
 #include "ash/common/test/ash_test.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
@@ skipping 208 matching lines @@
   DOM::Node* root_node = root->getChildren(nullptr)->get(0);
   DOM::Node* parent_node = root_node->getChildren(nullptr)->get(0);
   DOM::Node* child_node = parent_node->getChildren(nullptr)->get(0);
 
   Compare(parent_window, parent_node);
   Compare(child_window, child_node);
   child_window->Destroy();
   ExpectChildNodeRemoved(parent_node->getNodeId(), child_node->getNodeId());
 }
 
-TEST_F(AshDevToolsTest, WindowReorganizedChildNodeRemovedAndInserted) {
+TEST_F(AshDevToolsTest, WindowReorganizedChildNodeRearranged) {
   // Initialize DOMAgent
   std::unique_ptr<ui::devtools::protocol::DOM::Node> root;
   dom_agent()->getDocument(&root);
 
   WmWindow* root_window = WmShell::Get()->GetPrimaryRootWindow();
   WmWindow* target_window = root_window->GetChildren()[1];
   WmWindow* child_window = root_window->GetChildren()[0]->GetChildren()[0];
 
   DOM::Node* root_node = root->getChildren(nullptr)->get(0);
   DOM::Node* parent_node = root_node->getChildren(nullptr)->get(0);
   DOM::Node* target_node = root_node->getChildren(nullptr)->get(1);
   Array<DOM::Node>* target_node_children = target_node->getChildren(nullptr);
   DOM::Node* sibling_node =
       target_node_children->get(target_node_children->length() - 1);
   DOM::Node* child_node = parent_node->getChildren(nullptr)->get(0);
 
   Compare(target_window, target_node);
   Compare(child_window, child_node);
   target_window->AddChild(child_window);
   ExpectChildNodeRemoved(parent_node->getNodeId(), child_node->getNodeId());
   ExpectChildNodeInserted(target_node->getNodeId(), sibling_node->getNodeId());
 }
 
+#if defined(OS_WIN)
+#define MAYBE_WindowReorganizedChildNodeRemovedAndInserted \
+  DISABLED_WindowReorganizedChildNodeRemovedAndInserted
+#else
+#define MAYBE_WindowReorganizedChildNodeRemovedAndInserted \
+  WindowReorganizedChildNodeRemovedAndInserted
+#endif  // defined(OS_WIN)
+TEST_F(AshDevToolsTest, MAYBE_WindowReorganizedChildNodeRemovedAndInserted) {
+  WmWindow* root_window = WmShell::Get()->GetPrimaryRootWindow();
+  WmWindow* target_window = root_window->GetChildren()[1];
+  WmWindow* parent_window = root_window->GetChildren()[0];
+  std::unique_ptr<WindowOwner> child_owner(CreateChildWindow(parent_window));
+  WmWindow* child_window = child_owner->window();
+
+  // Initialize DOMAgent
+  std::unique_ptr<ui::devtools::protocol::DOM::Node> root;
+  dom_agent()->getDocument(&root);
+  DOM::Node* root_node = root->getChildren(nullptr)->get(0);
+
+  DOM::Node* parent_node = root_node->getChildren(nullptr)->get(0);
+  DOM::Node* target_node = root_node->getChildren(nullptr)->get(1);
+  Array<DOM::Node>* target_node_children = target_node->getChildren(nullptr);
+  DOM::Node* sibling_node =
+      target_node_children->get(target_node_children->length() - 1);
+  Array<DOM::Node>* parent_node_children = parent_node->getChildren(nullptr);
+  DOM::Node* child_node =
+      parent_node_children->get(parent_node_children->length() - 1);
+
+  Compare(target_window, target_node);
+  Compare(child_window, child_node);
+  parent_window->RemoveChild(child_window);
+  target_window->AddChild(child_window);
+  ExpectChildNodeRemoved(parent_node->getNodeId(), child_node->getNodeId());
+  ExpectChildNodeInserted(target_node->getNodeId(), sibling_node->getNodeId());
+}
+
 TEST_F(AshDevToolsTest, WindowStackingChangedChildNodeRemovedAndInserted) {
   // Initialize DOMAgent
   std::unique_ptr<ui::devtools::protocol::DOM::Node> root;
   dom_agent()->getDocument(&root);
 
   WmWindow* parent_window = WmShell::Get()->GetPrimaryRootWindow();
   WmWindow* child_window = parent_window->GetChildren()[0];
   WmWindow* target_window = parent_window->GetChildren()[1];
 
   DOM::Node* parent_node = root->getChildren(nullptr)->get(0);
   Array<DOM::Node>* parent_node_children = parent_node->getChildren(nullptr);
   DOM::Node* child_node = parent_node_children->get(0);
   DOM::Node* sibling_node = parent_node_children->get(1);
   int parent_id = parent_node->getNodeId();
 
   Compare(parent_window, parent_node);
   Compare(child_window, child_node);
   parent_window->StackChildAbove(child_window, target_window);
   ExpectChildNodeRemoved(parent_id, child_node->getNodeId());
   ExpectChildNodeInserted(parent_id, sibling_node->getNodeId());
 }
 
 }  // namespace ash