Revert of Start of display management 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 "base/stl_util.h"
 #include "build/build_config.h"
 #include "components/mus/common/args.h"
 #include "components/mus/gles2/gpu_impl.h"
@@ skipping 21 matching lines @@
 #endif
 
 using mojo::ApplicationConnection;
 using mojo::ApplicationImpl;
 using mojo::InterfaceRequest;
 using mus::mojom::WindowTreeHostFactory;
 using mus::mojom::Gpu;
 
 namespace mus {
 
-struct MandolineUIServicesApp::PendingRequest {
-  scoped_ptr<mojo::InterfaceRequest<mojom::DisplayManager>> dm_request;
-  scoped_ptr<mojo::InterfaceRequest<mojom::WindowManager>> wm_request;
-};
-
 MandolineUIServicesApp::MandolineUIServicesApp()
     : app_impl_(nullptr) {}
 
 MandolineUIServicesApp::~MandolineUIServicesApp() {
   if (gpu_state_)
     gpu_state_->StopThreads();
   // Destroy |connection_manager_| first, since it depends on |event_source_|.
   connection_manager_.reset();
 }
 
@@ skipping 28 matching lines @@
   if (!gpu_state_.get())
     gpu_state_ = new GpuState(hardware_rendering_available);
   connection_manager_.reset(new ws::ConnectionManager(this, surfaces_state_));
 
   tracing_.Initialize(app);
 }
 
 bool MandolineUIServicesApp::ConfigureIncomingConnection(
     ApplicationConnection* connection) {
   connection->AddService<Gpu>(this);
-  connection->AddService<mojom::DisplayManager>(this);
   connection->AddService<mojom::WindowManager>(this);
   connection->AddService<WindowTreeHostFactory>(this);
   return true;
 }
 
 void MandolineUIServicesApp::OnFirstRootConnectionCreated() {
-  PendingRequests requests;
-  requests.swap(pending_requests_);
-  for (auto& request : requests) {
-    if (request->dm_request)
-      Create(nullptr, std::move(*request->dm_request));
-    else
-      Create(nullptr, std::move(*request->wm_request));
-  }
+  WindowManagerRequests requests;
+  requests.swap(pending_window_manager_requests_);
+  for (auto& request : requests)
+    Create(nullptr, std::move(*request));
 }
 
 void MandolineUIServicesApp::OnNoMoreRootConnections() {
   app_impl_->Quit();
 }
 
 ws::ClientConnection*
 MandolineUIServicesApp::CreateClientConnectionForEmbedAtWindow(
     ws::ConnectionManager* connection_manager,
     mojo::InterfaceRequest<mojom::WindowTree> tree_request,
     ws::ServerWindow* root,
     uint32_t policy_bitmask,
     mojom::WindowTreeClientPtr client) {
   scoped_ptr<ws::WindowTreeImpl> service(
       new ws::WindowTreeImpl(connection_manager, root, policy_bitmask));
   return new ws::DefaultClientConnection(std::move(service), connection_manager,
                                          std::move(tree_request),
                                          std::move(client));
 }
 
 void MandolineUIServicesApp::Create(
     mojo::ApplicationConnection* connection,
-    mojo::InterfaceRequest<mojom::DisplayManager> request) {
-  if (!connection_manager_->has_tree_host_connections()) {
-    scoped_ptr<PendingRequest> pending_request(new PendingRequest);
-    pending_request->dm_request.reset(
-        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::ApplicationConnection* connection,
     mojo::InterfaceRequest<mojom::WindowManager> request) {
   if (!connection_manager_->has_tree_host_connections()) {
-    scoped_ptr<PendingRequest> pending_request(new PendingRequest);
-    pending_request->wm_request.reset(
-        new mojo::InterfaceRequest<mojom::WindowManager>(std::move(request)));
-    pending_requests_.push_back(std::move(pending_request));
+    pending_window_manager_requests_.push_back(make_scoped_ptr(
+        new mojo::InterfaceRequest<mojom::WindowManager>(std::move(request))));
     return;
   }
   if (!window_manager_impl_) {
     window_manager_impl_.reset(
         new ws::ForwardingWindowManager(connection_manager_.get()));
   }
   window_manager_bindings_.AddBinding(window_manager_impl_.get(),
                                       std::move(request));
 }
 
@@ skipping 22 matching lines @@
       std::move(host_client), connection_manager_.get(), app_impl_, gpu_state_,
       surfaces_state_, std::move(window_manager));
 
   // WindowTreeHostConnection manages its own lifetime.
   host_impl->Init(new ws::WindowTreeHostConnectionImpl(
       std::move(host), make_scoped_ptr(host_impl), std::move(tree_client),
       connection_manager_.get()));
 }
 
 }  // namespace mus