Converts test_wm to use aura

services/ui/ws/window_tree.cc

 // Copyright 2014 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 "services/ui/ws/window_tree.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 289 matching lines @@
   if (window && transient_window && !transient_window->Contains(window) &&
       access_policy_->CanAddTransientWindow(window, transient_window)) {
     Operation op(this, window_server_, OperationType::ADD_TRANSIENT_WINDOW);
     return window->AddTransientWindow(transient_window);
   }
   return false;
 }
 
 bool WindowTree::DeleteWindow(const ClientWindowId& window_id) {
   ServerWindow* window = GetWindowByClientId(window_id);
+  DVLOG(2) << "removing window from parent client=" << id_

[msw, 2016/11/17 21:26:14]

q: use level 3 to avoid level-2 spam for expected behavior? ditto below

[sky, 2016/11/17 22:25:54]

Done.

+           << " local window_id= " << window_id.id << " glocal window_id="

[msw, 2016/11/17 21:26:15]

q: glocal? ditto below

[sky, 2016/11/17 22:25:54]

Done.

+           << (window ? WindowIdToTransportId(window->id()) : 0);
   if (!window)
     return false;
 
   if (roots_.count(window) > 0) {
     // Deleting a root behaves as an unembed.
     window_server_->OnTreeMessagedClient(id_);
     RemoveRoot(window, RemoveRootReason::UNEMBED);
     return true;
   }
 
@@ skipping 868 matching lines @@
 }
 
 void WindowTree::AddWindow(uint32_t change_id, Id parent_id, Id child_id) {
   client()->OnChangeCompleted(change_id, AddWindow(ClientWindowId(parent_id),
                                                    ClientWindowId(child_id)));
 }
 
 void WindowTree::RemoveWindowFromParent(uint32_t change_id, Id window_id) {
   bool success = false;
   ServerWindow* window = GetWindowByClientId(ClientWindowId(window_id));
-  if (window && window->parent() &&
-      access_policy_->CanRemoveWindowFromParent(window)) {
+  DVLOG(2) << "removing window from parent client=" << id_
+           << " local window_id= " << window_id << " glocal window_id="
+           << (window ? WindowIdToTransportId(window->id()) : 0);
+  if (!window) {
+    DVLOG(1) << "remove failing, invalid window id=" << change_id;
+  } else if (!window->parent()) {
+    DVLOG(1) << "remove failing, no parent id=" << change_id;
+  } else if (access_policy_->CanRemoveWindowFromParent(window)) {
+    DVLOG(1) << "remove failing, access policy disallowed id=" << change_id;
+  } else {
     success = true;
     Operation op(this, window_server_,
                  OperationType::REMOVE_WINDOW_FROM_PARENT);
     window->parent()->Remove(window);
   }
   client()->OnChangeCompleted(change_id, success);
 }
 
 void WindowTree::AddTransientWindow(uint32_t change_id,
                                     Id window,
@@ skipping 724 matching lines @@
   client()->OnCompleteDrop(client_window_id.id, event_flags, cursor_offset,
                            effect_bitmask, callback);
 }
 
 void WindowTree::PerformOnDragDropDone() {
   client()->OnDragDropDone();
 }
 
 }  // namespace ws
 }  // namespace ui