Revert: Change CaptureSynchronizer and PointerWatcherEventRouter to support multiple CaptureClients

ui/aura/mus/window_tree_client_unittest.cc

 // Copyright 2015 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/aura/mus/window_tree_client.h"
 
 #include <stdint.h>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mojo/public/cpp/bindings/map.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "services/ui/public/interfaces/window_manager.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/client/capture_client_observer.h"
-#include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/client/transient_window_client.h"
-#include "ui/aura/mus/capture_synchronizer.h"
 #include "ui/aura/mus/property_converter.h"
 #include "ui/aura/mus/window_mus.h"
 #include "ui/aura/mus/window_tree_client_delegate.h"
 #include "ui/aura/mus/window_tree_client_observer.h"
 #include "ui/aura/mus/window_tree_host_mus.h"
 #include "ui/aura/test/aura_mus_test_base.h"
 #include "ui/aura/test/mus/test_window_tree.h"
 #include "ui/aura/test/mus/window_tree_client_private.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
@@ skipping 1324 matching lines @@
   capture_recorder.reset_capture_captured_count();
 
   // Changes originating from server should notify observers too.
   window_tree_client()->OnCaptureChanged(server_id(&child2), 0);
   EXPECT_EQ(1, capture_recorder.capture_changed_count());
   EXPECT_EQ(child2_id, capture_recorder.last_gained_capture_window_id());
   EXPECT_EQ(0, capture_recorder.last_lost_capture_window_id());
   capture_recorder.reset_capture_captured_count();
 }
 
-TEST_F(WindowTreeClientClientTest, TwoWindowTreesRequestCapture) {
-  // Creating a WindowTreeHost so we can have two root windows: top_level
-  // and root_window().
-  WindowTreeHostMus window_tree_host(window_tree_client_impl());
-  Window* top_level = window_tree_host.window();
-  window_tree_host.InitHost();
-  client::DefaultCaptureClient* capture_client(
-      new client::DefaultCaptureClient());
-  client::SetCaptureClient(top_level, capture_client);
-  window_tree_client_impl()->capture_synchronizer()->AttachToCaptureClient(
-      capture_client);
-  EXPECT_NE(server_id(top_level), server_id(root_window()));
-
-  // Ack the request to the windowtree to create the new window.
-  uint32_t change_id;
-  ASSERT_TRUE(window_tree()->GetAndRemoveFirstChangeOfType(
-      WindowTreeChangeType::NEW_TOP_LEVEL, &change_id));
-  EXPECT_EQ(window_tree()->window_id(), server_id(top_level));
-
-  ui::mojom::WindowDataPtr data = ui::mojom::WindowData::New();
-  data->window_id = server_id(top_level);
-  data->visible = true;
-  const int64_t display_id = 1;
-  window_tree_client()->OnTopLevelCreated(change_id, std::move(data),
-                                          display_id, true);
-  EXPECT_EQ(
-      0u, window_tree()->GetChangeCountForType(WindowTreeChangeType::VISIBLE));
-  EXPECT_TRUE(top_level->TargetVisibility());
-
-  CaptureRecorder capture_recorder1(root_window());
-  CaptureRecorder capture_recorder2(top_level);
-  EXPECT_NE(client::GetCaptureClient(root_window()),
-            client::GetCaptureClient(top_level));
-
-  EXPECT_EQ(0, capture_recorder1.capture_changed_count());
-  EXPECT_EQ(0, capture_recorder2.capture_changed_count());
-  // Give capture to top_level and ensure everyone is notified correctly.
-  top_level->SetCapture();
-  ASSERT_TRUE(window_tree()->AckSingleChangeOfType(
-      WindowTreeChangeType::CAPTURE, true));
-  EXPECT_EQ(0, capture_recorder1.capture_changed_count());
-  EXPECT_EQ(1, capture_recorder2.capture_changed_count());
-  EXPECT_EQ(top_level->id(), capture_recorder2.last_gained_capture_window_id());
-  EXPECT_EQ(0, capture_recorder2.last_lost_capture_window_id());
-  top_level->ReleaseCapture();
-  capture_recorder1.reset_capture_captured_count();
-  capture_recorder2.reset_capture_captured_count();
-
-  // Release capture of top_level shouldn't affect the capture of root_window().
-  top_level->SetCapture();
-  root_window()->SetCapture();
-  top_level->ReleaseCapture();
-  EXPECT_EQ(1, capture_recorder1.capture_changed_count());
-  EXPECT_EQ(2, capture_recorder2.capture_changed_count());
-  EXPECT_EQ(root_window()->id(),
-            capture_recorder1.last_gained_capture_window_id());
-  EXPECT_EQ(0, capture_recorder1.last_lost_capture_window_id());
-  EXPECT_EQ(0, capture_recorder2.last_gained_capture_window_id());
-  EXPECT_EQ(top_level->id(), capture_recorder2.last_lost_capture_window_id());
-  capture_recorder1.reset_capture_captured_count();
-  capture_recorder2.reset_capture_captured_count();
-}
-
 TEST_F(WindowTreeClientClientTest, ModalFail) {
   Window window(nullptr);
   window.Init(ui::LAYER_NOT_DRAWN);
   window.SetProperty(client::kModalKey, ui::MODAL_TYPE_WINDOW);
   // Make sure server was told about it, and have the server say it failed.
   ASSERT_TRUE(
       window_tree()->AckSingleChangeOfType(WindowTreeChangeType::MODAL, false));
   // Type should be back to MODAL_TYPE_NONE as the server didn't accept the
   // change.
   EXPECT_EQ(ui::MODAL_TYPE_NONE, window.GetProperty(client::kModalKey));
@@ skipping 118 matching lines @@
   window_tree_client()->OnTopLevelCreated(change_id, std::move(data),
                                           display_id, true);
 
   // aura::Window should operate in DIP and aura::WindowTreeHost should operate
   // in pixels.
   EXPECT_EQ(gfx::Rect(0, 0, 3, 4), top_level->bounds());
   EXPECT_EQ(gfx::Rect(2, 4, 6, 8), top_level->GetHost()->GetBoundsInPixels());
 }
 
 }  // namespace aura