Revert: Change CaptureSynchronizer and PointerWatcherEventRouter to support multiple CaptureClients

ui/views/mus/desktop_window_tree_host_mus_unittest.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/debug/stack_trace.h"
 
 #include "base/memory/ptr_util.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/client/transient_window_client.h"
-#include "ui/aura/mus/capture_synchronizer.h"
 #include "ui/aura/mus/in_flight_change.h"
-#include "ui/aura/mus/window_mus.h"
-#include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/test/mus/change_completion_waiter.h"
 #include "ui/aura/window.h"
 #include "ui/views/mus/mus_client.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/views/widget/widget_observer.h"
 
 namespace views {
 
@@ skipping 94 matching lines @@
   widget->Show();
   EXPECT_TRUE(widget->IsVisible());
   EXPECT_TRUE(widget->GetNativeView()->IsVisible());
   EXPECT_TRUE(widget->GetNativeView()->parent()->IsVisible());
   widget->Hide();
   EXPECT_FALSE(widget->IsVisible());
   EXPECT_FALSE(widget->GetNativeView()->IsVisible());
   EXPECT_FALSE(widget->GetNativeView()->parent()->IsVisible());
 }
 
-TEST_F(DesktopWindowTreeHostMusTest, Capture) {
-  std::unique_ptr<Widget> widget1(CreateWidget());
-  widget1->Show();
-  EXPECT_FALSE(widget1->HasCapture());
-
-  std::unique_ptr<Widget> widget2(CreateWidget());
-  widget2->Show();
-  EXPECT_FALSE(widget2->HasCapture());
-
-  widget1->SetCapture(widget1->GetRootView());
-  EXPECT_TRUE(widget1->HasCapture());
-  EXPECT_FALSE(widget2->HasCapture());
-  EXPECT_EQ(widget1->GetNativeWindow(), MusClient::Get()
-                                            ->window_tree_client()
-                                            ->capture_synchronizer()
-                                            ->capture_window()
-                                            ->GetWindow());
-
-  widget2->SetCapture(widget2->GetRootView());
-  EXPECT_TRUE(widget2->HasCapture());
-  EXPECT_EQ(widget2->GetNativeWindow(), MusClient::Get()
-                                            ->window_tree_client()
-                                            ->capture_synchronizer()
-                                            ->capture_window()
-                                            ->GetWindow());
-
-  widget1->ReleaseCapture();
-  EXPECT_TRUE(widget2->HasCapture());
-  EXPECT_FALSE(widget1->HasCapture());
-  EXPECT_EQ(widget2->GetNativeWindow(), MusClient::Get()
-                                            ->window_tree_client()
-                                            ->capture_synchronizer()
-                                            ->capture_window()
-                                            ->GetWindow());
-
-  widget2->ReleaseCapture();
-  EXPECT_FALSE(widget2->HasCapture());
-  EXPECT_FALSE(widget1->HasCapture());
-  EXPECT_EQ(nullptr, MusClient::Get()
-                         ->window_tree_client()
-                         ->capture_synchronizer()
-                         ->capture_window());
-}
-
 TEST_F(DesktopWindowTreeHostMusTest, Deactivate) {
   std::unique_ptr<Widget> widget1(CreateWidget());
   widget1->Show();
 
   std::unique_ptr<Widget> widget2(CreateWidget());
   widget2->Show();
 
   widget1->Activate();
   RunPendingMessages();
   EXPECT_TRUE(widget1->IsActive());
@@ skipping 72 matching lines @@
   aura::client::TransientWindowClient* transient_window_client =
       aura::client::GetTransientWindowClient();
   // Even though the widget1->GetNativeView() was specified as the parent we
   // expect the transient parents to be marked at the host level.
   EXPECT_EQ(widget1->GetNativeView()->GetHost()->window(),
             transient_window_client->GetTransientParent(
                 widget2->GetNativeView()->GetHost()->window()));
 }
 
 }  // namespace views