Changes how window manager obtains WindowTree from 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/bind.h"
 #include "base/command_line.h"
@@ skipping 181 matching lines @@
   platform_screen_->Init();
   window_server_.reset(
       new ws::WindowServer(this, platform_display_init_params_.surfaces_state));
 }
 
 bool MusApp::AcceptConnection(Connection* connection) {
   connection->AddInterface<mojom::Clipboard>(this);
   connection->AddInterface<mojom::DisplayManager>(this);
   connection->AddInterface<mojom::UserAccessManager>(this);
   connection->AddInterface<WindowTreeHostFactory>(this);
-  connection->AddInterface<mojom::WindowManagerFactoryService>(this);
+  connection->AddInterface<mojom::WindowManagerWindowTreeFactory>(this);
   connection->AddInterface<mojom::WindowTreeFactory>(this);
   if (test_config_)
     connection->AddInterface<WindowServerTest>(this);
 
   if (use_chrome_gpu_command_buffer_) {
     connection->AddInterface<mojom::GpuService>(this);
   } else {
     connection->AddInterface<Gpu>(this);
   }
 
@@ skipping 52 matching lines @@
     return;
   new GpuServiceImpl(std::move(request), connection);
 }
 
 void MusApp::Create(shell::Connection* connection,
                     mojom::UserAccessManagerRequest request) {
   window_server_->user_id_tracker()->Bind(std::move(request));
 }
 
 void MusApp::Create(shell::Connection* connection,
-                    mojom::WindowManagerFactoryServiceRequest request) {
+                    mojom::WindowManagerWindowTreeFactoryRequest request) {
   AddUserIfNecessary(connection);
-  window_server_->window_manager_factory_registry()->Register(
+  window_server_->window_manager_window_tree_factory_set()->Add(
       connection->GetRemoteIdentity().user_id(), std::move(request));
 }
 
 void MusApp::Create(Connection* connection,
                     mojom::WindowTreeFactoryRequest request) {
   AddUserIfNecessary(connection);
   if (!window_server_->display_manager()->has_displays()) {
     std::unique_ptr<PendingRequest> pending_request(new PendingRequest);
     pending_request->connection = connection;
     pending_request->wtf_request.reset(
@@ skipping 30 matching lines @@
   platform_display_init_params_.display_bounds = bounds;
   platform_display_init_params_.display_id = id;
 
   // Display manages its own lifetime.
   ws::Display* host_impl =
       new ws::Display(window_server_.get(), platform_display_init_params_);
   host_impl->Init(nullptr);
 }
 
 }  // namespace mus