Finish eliminating PlatformWindowMus

ui/views/mus/native_widget_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/native_widget_mus.h"
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "components/mus/public/cpp/tests/window_tree_client_impl_private.h"
@@ skipping 400 matching lines @@
   content->AddPreTargetHandler(&handler);
 
   std::unique_ptr<ui::MouseEvent> mouse = CreateMouseEvent();
   NativeWidgetMus* native_widget =
       static_cast<NativeWidgetMus*>(widget->native_widget_private());
   mus::WindowTreeClientImplPrivate test_api(native_widget->window());
   test_api.CallOnWindowInputEvent(native_widget->window(), *mouse);
   EXPECT_EQ(1, handler.num_mouse_events());
 }
 
-// Tests that an incoming UI event is acked with the handled status.
-TEST_F(NativeWidgetMusTest, EventAcked) {
-  std::unique_ptr<Widget> widget(CreateWidget(nullptr));
-  widget->Show();
-
-  View* content = new HandleMousePressView;
-  content->SetBounds(10, 20, 90, 180);
-  widget->GetContentsView()->AddChildView(content);
-
-  // Dispatch an input event to the window and view.
-  std::unique_ptr<ui::MouseEvent> event = CreateMouseEvent();
-  std::unique_ptr<base::Callback<void(EventResult)>> ack_callback(
-      new base::Callback<void(EventResult)>(base::Bind(
-          &NativeWidgetMusTest::AckCallback, base::Unretained(this))));
-  OnWindowInputEvent(
-      static_cast<NativeWidgetMus*>(widget->native_widget_private()),
-      *event,
-      &ack_callback);
-
-  // The test took ownership of the callback and called it.
-  EXPECT_FALSE(ack_callback);
-  EXPECT_EQ(1, ack_callback_count());
-}
-
-// Tests that a window that is deleted during event handling properly acks the
-// event.
-TEST_F(NativeWidgetMusTest, EventAckedWithWindowDestruction) {
-  std::unique_ptr<Widget> widget(CreateWidget(nullptr));
-  widget->Show();
-
-  View* content = new DeleteWidgetView(&widget);
-  content->SetBounds(10, 20, 90, 180);
-  widget->GetContentsView()->AddChildView(content);
-
-  // Dispatch an input event to the window and view.
-  std::unique_ptr<ui::MouseEvent> event = CreateMouseEvent();
-  std::unique_ptr<base::Callback<void(EventResult)>> ack_callback(
-      new base::Callback<void(EventResult)>(base::Bind(
-          &NativeWidgetMusTest::AckCallback, base::Unretained(this))));
-  OnWindowInputEvent(
-      static_cast<NativeWidgetMus*>(widget->native_widget_private()),
-      *event,
-      &ack_callback);
-
-  // The widget was deleted.
-  EXPECT_FALSE(widget.get());
-
-  // The test took ownership of the callback and called it.
-  EXPECT_FALSE(ack_callback);
-  EXPECT_EQ(1, ack_callback_count());
-}
-

[sadrul, 2016/05/26 01:31:01]

We should keep these tests.

[Mark Dittmer, 2016/05/26 13:37:33]

Done.

 TEST_F(NativeWidgetMusTest, SetAndReleaseCapture) {
   std::unique_ptr<Widget> widget(CreateWidget(nullptr));
   widget->Show();
   View* content = new View;
   widget->GetContentsView()->AddChildView(content);
   internal::NativeWidgetPrivate* widget_private =
       widget->native_widget_private();
   mus::Window* mus_window =
       static_cast<NativeWidgetMus*>(widget_private)->window();
   EXPECT_FALSE(widget_private->HasCapture());
   EXPECT_FALSE(mus_window->HasCapture());
 
   widget->SetCapture(content);
   EXPECT_TRUE(widget_private->HasCapture());
   EXPECT_TRUE(mus_window->HasCapture());
 
   widget->ReleaseCapture();
   EXPECT_FALSE(widget_private->HasCapture());
   EXPECT_FALSE(mus_window->HasCapture());
 }
 
 }  // namespace views