Revert: Change CaptureSynchronizer and PointerWatcherEventRouter to support multiple CaptureClients

ash/mus/window_manager.cc

Index: ash/mus/window_manager.cc
diff --git a/ash/mus/window_manager.cc b/ash/mus/window_manager.cc
index c0233919f382d46d17f9630b54832f46aaf14b50..bcf577263f5dceae73476f445cf9f2d183c615f8 100644
--- a/ash/mus/window_manager.cc
+++ b/ash/mus/window_manager.cc
@@ -41,7 +41,6 @@
 #include "services/ui/public/interfaces/window_manager.mojom.h"
 #include "ui/aura/client/window_parenting_client.h"
 #include "ui/aura/env.h"
-#include "ui/aura/mus/capture_synchronizer.h"
 #include "ui/aura/mus/property_converter.h"
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/mus/window_tree_host_mus.h"
@@ -115,13 +114,6 @@
       std::move(frame_decoration_values));
 
   lookup_.reset(new WmLookupMus);
-
-  // Notify PointerWatcherEventRouter and CaptureSynchronizer that the capture
-  // client has been set.
-  aura::client::CaptureClient* capture_client = wm_state_->capture_controller();
-  pointer_watcher_event_router_->AttachToCaptureClient(capture_client);
-  window_tree_client_->capture_synchronizer()->AttachToCaptureClient(
-      capture_client);
 }
 
 void WindowManager::DeleteAllRootWindowControllers() {
@@ -245,11 +237,6 @@
 void WindowManager::Shutdown() {
   if (!window_tree_client_)
     return;
-
-  aura::client::CaptureClient* capture_client = wm_state_->capture_controller();
-  pointer_watcher_event_router_->DetachFromCaptureClient(capture_client);
-  window_tree_client_->capture_synchronizer()->DetachFromCaptureClient(
-      capture_client);
 
   Shell::DeleteInstance();