Makes it so each windowtreeclient can use whatever ids it wants

components/mus/ws/connection_manager.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/connection_manager.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "components/mus/ws/client_connection.h"
 #include "components/mus/ws/connection_manager_delegate.h"
@@ skipping 265 matching lines @@
     return;
   }
 
   WindowTreeImpl* connection = GetConnection(change.connection_id);
   connection->OnChangeCompleted(change.client_change_id, success);
 }
 
 void ConnectionManager::WindowManagerCreatedTopLevelWindow(
     WindowTreeImpl* wm_connection,
     uint32_t window_manager_change_id,
-    Id transport_window_id) {
+    const ServerWindow* window) {
   InFlightWindowManagerChange change;
   if (!GetAndClearInFlightWindowManagerChange(window_manager_change_id,
                                               &change)) {
     return;
   }
+  if (!window) {
+    WindowManagerSentBogusMessage();
+    return;
+  }
 
-  const WindowId window_id(WindowIdFromTransportId(transport_window_id));
-  const ServerWindow* window = GetWindow(window_id);
   WindowTreeImpl* connection = GetConnection(change.connection_id);
   // The window manager should have created the window already, and it should
   // be ready for embedding.
   if (!connection->IsWaitingForNewTopLevelWindow(window_manager_change_id) ||
       !window || window->id().connection_id != wm_connection->id() ||
       !window->children().empty() || GetConnectionWithRoot(window)) {
-    WindowManagerSentBogusMessage(connection);
+    WindowManagerSentBogusMessage();
     return;
   }
 
   connection->OnWindowManagerCreatedTopLevelWindow(
-      window_manager_change_id, change.client_change_id, window_id);
+      window_manager_change_id, change.client_change_id, window);
 }
 
 void ConnectionManager::ProcessWindowBoundsChanged(
     const ServerWindow* window,
     const gfx::Rect& old_bounds,
     const gfx::Rect& new_bounds) {
   for (auto& pair : connection_map_) {
     pair.second->service()->ProcessWindowBoundsChanged(
         window, old_bounds, new_bounds, IsOperationSource(pair.first));
   }
@@ skipping 354 matching lines @@
   if (!got_valid_frame_decorations_) {
     display_manager_observers_.AddInterfacePtr(std::move(observer));
     return;
   }
   CallOnDisplays(observer.get());
   display_manager_observers_.AddInterfacePtr(std::move(observer));
 }
 
 }  // namespace ws
 }  // namespace mus