Revert: Change CaptureSynchronizer and PointerWatcherEventRouter to support multiple CaptureClients

ui/aura/mus/capture_synchronizer.h

Index: ui/aura/mus/capture_synchronizer.h
diff --git a/ui/aura/mus/capture_synchronizer.h b/ui/aura/mus/capture_synchronizer.h
index 4b300160f296e9d4718a8a587ef042eefaea1eb4..87bce872168d8c50d69ab3361b1d2643d8affb9b 100644
--- a/ui/aura/mus/capture_synchronizer.h
+++ b/ui/aura/mus/capture_synchronizer.h
@@ -28,21 +28,18 @@
 
 // CaptureSynchronizer is resonsible for keeping capture in sync between aura
 // and the mus server.
-class AURA_EXPORT CaptureSynchronizer : public WindowObserver,
-                                        public client::CaptureClientObserver {
+class CaptureSynchronizer : public WindowObserver,
+                            public client::CaptureClientObserver {
  public:
   CaptureSynchronizer(CaptureSynchronizerDelegate* delegate,
-                      ui::mojom::WindowTree* window_tree);
+                      ui::mojom::WindowTree* window_tree,
+                      client::CaptureClient* capture_client);
   ~CaptureSynchronizer() override;
 
   WindowMus* capture_window() { return capture_window_; }
 
   // Called when the server side wants to change capture to |window|.
   void SetCaptureFromServer(WindowMus* window);
-
-  // Called when the |capture_client| has been set or will be unset.
-  void AttachToCaptureClient(client::CaptureClient* capture_client);
-  void DetachFromCaptureClient(client::CaptureClient* capture_client);
 
  private:
   // Internal implementation for capture changes. Adds/removes observer as
@@ -57,6 +54,7 @@
 
   CaptureSynchronizerDelegate* delegate_;
   ui::mojom::WindowTree* window_tree_;
+  client::CaptureClient* capture_client_;
 
   // Window that currently has capture.
   WindowMus* capture_window_ = nullptr;