Revert: Change CaptureSynchronizer and PointerWatcherEventRouter to support multiple CaptureClients

ui/views/mus/desktop_window_tree_host_mus.cc

 // Copyright 2016 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 "ui/views/mus/desktop_window_tree_host_mus.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "ui/aura/client/aura_constants.h"
-#include "ui/aura/client/capture_client.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/client/drag_drop_client.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/client/transient_window_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/mus/window_port_mus.h"
 #include "ui/aura/mus/window_tree_host_mus.h"
 #include "ui/aura/window.h"
 #include "ui/base/hit_test.h"
 #include "ui/display/screen.h"
@@ skipping 291 matching lines @@
   // Widget can notify everyone listening for that signal.
   native_widget_delegate_->OnNativeWidgetActivationChanged(active);
 }
 
 void DesktopWindowTreeHostMus::OnWidgetInitDone() {
   // Because of construction order it's possible the bounds have changed before
   // the NonClientView was created, which means we may not have sent the
   // client-area and hit-test-mask.
   SendClientAreaToServer();
   SendHitTestMaskToServer();
-
-  MusClient::Get()->OnCaptureClientSet(
-      aura::client::GetCaptureClient(window()));
 }
 
 std::unique_ptr<corewm::Tooltip> DesktopWindowTreeHostMus::CreateTooltip() {
   return base::MakeUnique<corewm::TooltipAura>();
 }
 
 std::unique_ptr<aura::client::DragDropClient>
 DesktopWindowTreeHostMus::CreateDragDropClient(
     DesktopNativeCursorManager* cursor_manager) {
   // aura-mus handles installing a DragDropClient.
   return nullptr;
 }
 
 void DesktopWindowTreeHostMus::Close() {
   if (close_widget_factory_.HasWeakPtrs())
     return;
 
   // Even though we don't close immediately, we need to hide immediately
   // (otherwise events may be processed, which is unexpected).
   Hide();
 
   // Close doesn't delete this immediately, as 'this' may still be on the stack
   // resulting in possible crashes when the stack unwindes.
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&DesktopWindowTreeHostMus::CloseNow,
                             close_widget_factory_.GetWeakPtr()));
 }
 
 void DesktopWindowTreeHostMus::CloseNow() {
-  MusClient::Get()->OnCaptureClientUnset(
-      aura::client::GetCaptureClient(window()));
-
   native_widget_delegate_->OnNativeWidgetDestroying();
 
   // If we have children, close them. Use a copy for iteration because they'll
   // remove themselves from |children_|.
   std::set<DesktopWindowTreeHostMus*> children_copy = children_;
   for (DesktopWindowTreeHostMus* child : children_copy)
     child->CloseNow();
   DCHECK(children_.empty());
 
   if (parent_) {
@@ skipping 424 matching lines @@
     aura::client::FocusClient* focus_client,
     aura::Window* window) {
   if (window == this->window()) {
     desktop_native_widget_aura_->HandleActivationChanged(true);
   } else if (is_active_) {
     desktop_native_widget_aura_->HandleActivationChanged(false);
   }
 }
 
 }  // namespace views