mus: Fix closing windows created after the first window.

components/mus/ws/window_tree_impl.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 "components/mus/ws/window_tree_impl.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 1105 matching lines @@
 void WindowTreeImpl::WmRequestClose(Id transport_window_id) {
   // Only the WindowManager should be using this.
   WindowTreeHostImpl* host = GetHostForWindowManager();
   if (!host)
     return;
 
   ServerWindow* window = GetWindow(MapWindowIdFromClient(transport_window_id));
   WindowTreeImpl* connection =
       connection_manager_->GetConnectionWithRoot(window);
   if (connection && connection != host->GetWindowTree())
-    connection->client_->RequestClose(MapWindowIdToClient(window));
+    connection->client_->RequestClose(connection->MapWindowIdToClient(window));
   // TODO(sky): think about what else case means.
 }
 
 void WindowTreeImpl::OnWmCreatedTopLevelWindow(uint32_t change_id,
                                                Id transport_window_id) {
   if (GetHostForWindowManager()) {
     connection_manager_->WindowManagerCreatedTopLevelWindow(
         this, change_id, transport_window_id);
   }
   // TODO(sky): think about what else case means.
@@ skipping 21 matching lines @@
 
   for (const auto* root : roots_) {
     if (root->Contains(window))
       return true;
   }
   return false;
 }
 
 }  // namespace ws
 }  // namespace mus