Revert: Change CaptureSynchronizer and PointerWatcherEventRouter to support multiple CaptureClients

ui/views/mus/pointer_watcher_event_router.cc

Index: ui/views/mus/pointer_watcher_event_router.cc
diff --git a/ui/views/mus/pointer_watcher_event_router.cc b/ui/views/mus/pointer_watcher_event_router.cc
index 3daf94c0c3ac9f78b1fb5efd3c4f803bf31d8b7c..26b4c06683ee813d1c77ba5a7c0c9ffe4c064b3a 100644
--- a/ui/views/mus/pointer_watcher_event_router.cc
+++ b/ui/views/mus/pointer_watcher_event_router.cc
@@ -27,11 +27,14 @@
     aura::WindowTreeClient* window_tree_client)
     : window_tree_client_(window_tree_client) {
   window_tree_client->AddObserver(this);
+  window_tree_client_->GetCaptureClient()->AddObserver(this);
 }
 
 PointerWatcherEventRouter::~PointerWatcherEventRouter() {
-  if (window_tree_client_)
+  if (window_tree_client_) {
     window_tree_client_->RemoveObserver(this);
+    window_tree_client_->GetCaptureClient()->RemoveObserver(this);
+  }
 }
 
 void PointerWatcherEventRouter::AddPointerWatcher(PointerWatcher* watcher,
@@ -129,16 +132,6 @@
   }
 }
 
-void PointerWatcherEventRouter::AttachToCaptureClient(
-    aura::client::CaptureClient* capture_client) {
-  capture_client->AddObserver(this);
-}
-
-void PointerWatcherEventRouter::DetachFromCaptureClient(
-    aura::client::CaptureClient* capture_client) {
-  capture_client->RemoveObserver(this);
-}
-
 PointerWatcherEventRouter::EventTypes
 PointerWatcherEventRouter::DetermineEventTypes() {
   if (HasPointerWatcher(&move_watchers_))
@@ -168,6 +161,7 @@
   // We expect that all observers have been removed by this time.
   DCHECK_EQ(event_types_, EventTypes::NONE);
   DCHECK_EQ(client, window_tree_client_);
+  window_tree_client_->GetCaptureClient()->RemoveObserver(this);
   window_tree_client_->RemoveObserver(this);
   window_tree_client_ = nullptr;
 }