More user id tracking for mus:

components/mus/mus_app.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/mus_app.h"
 
 #include <set>
 
 #include "base/memory/weak_ptr.h"
 #include "base/stl_util.h"
@@ skipping 131 matching lines @@
   connection->AddInterface<mojom::WindowManagerFactoryService>(this);
   connection->AddInterface<mojom::WindowTreeFactory>(this);
   connection->AddInterface<WindowTreeHostFactory>(this);
   return true;
 }
 
 void MandolineUIServicesApp::OnFirstRootConnectionCreated() {
   PendingRequests requests;
   requests.swap(pending_requests_);
   for (auto& request : requests) {
+    // TODO(sky): this needs to cache user id too!
     if (request->dm_request)
       Create(nullptr, std::move(*request->dm_request));
     else
       Create(nullptr, std::move(*request->wtf_request));
   }
 }
 
 void MandolineUIServicesApp::OnNoMoreRootConnections() {
   base::MessageLoop::current()->QuitWhenIdle();
 }
@@ skipping 23 matching lines @@
         new mojo::InterfaceRequest<mojom::DisplayManager>(std::move(request)));
     pending_requests_.push_back(std::move(pending_request));
     return;
   }
   connection_manager_->AddDisplayManagerBinding(std::move(request));
 }
 
 void MandolineUIServicesApp::Create(
     mojo::Connection* connection,
     mojom::WindowManagerFactoryServiceRequest request) {
-  connection_manager_->CreateWindowManagerFactoryService(
+  connection_manager_->window_manager_factory_registry()->Register(
       connection->GetRemoteUserID(), std::move(request));
 }
 
 void MandolineUIServicesApp::Create(Connection* connection,
                                     mojom::WindowTreeFactoryRequest request) {
   if (!connection_manager_->has_tree_host_connections()) {
     scoped_ptr<PendingRequest> pending_request(new PendingRequest);
     pending_request->wtf_request.reset(
         new mojo::InterfaceRequest<mojom::WindowTreeFactory>(
             std::move(request)));
@@ skipping 30 matching lines @@
       connection_manager_.get(), connector_, gpu_state_, surfaces_state_);
 
   scoped_ptr<ws::WindowTreeHostConnectionImpl> host_connection(
       new ws::WindowTreeHostConnectionImpl(std::move(host), host_impl,
                                            std::move(tree_client),
                                            connection_manager_.get()));
   host_impl->Init(std::move(host_connection));
 }
 
 }  // namespace mus