Revert: Change CaptureSynchronizer and PointerWatcherEventRouter to support multiple CaptureClients

ui/views/widget/desktop_aura/desktop_capture_client.cc

Index: ui/views/widget/desktop_aura/desktop_capture_client.cc
diff --git a/ui/views/widget/desktop_aura/desktop_capture_client.cc b/ui/views/widget/desktop_aura/desktop_capture_client.cc
index c434a9fcfbc580ab962f82ec070ab778e06b99b6..6c1d0b8dd7cc33c2d36060c081b63a2bf7c3a872 100644
--- a/ui/views/widget/desktop_aura/desktop_capture_client.cc
+++ b/ui/views/widget/desktop_aura/desktop_capture_client.cc
@@ -4,7 +4,6 @@
 
 #include "ui/views/widget/desktop_aura/desktop_capture_client.h"
 
-#include "ui/aura/client/capture_client_observer.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tracker.h"
@@ -86,9 +85,6 @@
       }
     }
   }  // else case is capture is remaining in our root, nothing to do.
-
-  for (auto& observer : observers_)
-    observer.OnCaptureChanged(old_capture_window, capture_window_);
 }
 
 void DesktopCaptureClient::ReleaseCapture(aura::Window* window) {
@@ -107,12 +103,12 @@
 
 void DesktopCaptureClient::AddObserver(
     aura::client::CaptureClientObserver* observer) {
-  observers_.AddObserver(observer);
+  NOTREACHED();
 }
 
 void DesktopCaptureClient::RemoveObserver(
     aura::client::CaptureClientObserver* observer) {
-  observers_.RemoveObserver(observer);
+  NOTREACHED();
 }
 
 }  // namespace views