Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(923)

Unified Diff: components/mus/public/cpp/tests/window_tree_client_impl_unittest.cc

Issue 1806703002: Use ui::Event instead of mojom::EventPtr in mus::InputEventHandler. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/mus/public/cpp/tests/window_tree_client_impl_unittest.cc
diff --git a/components/mus/public/cpp/tests/window_tree_client_impl_unittest.cc b/components/mus/public/cpp/tests/window_tree_client_impl_unittest.cc
index 3e1b707609642909f2835b4e16712825b6e582a2..b6c73016100b886360e23ae372557cf2b4806125 100644
--- a/components/mus/public/cpp/tests/window_tree_client_impl_unittest.cc
+++ b/components/mus/public/cpp/tests/window_tree_client_impl_unittest.cc
@@ -140,7 +140,7 @@ class TestInputEventHandler : public InputEventHandler {
// InputEventHandler:
void OnWindowInputEvent(
Window* target,
- mojom::EventPtr event,
+ ui::Event* event,
scoped_ptr<base::Callback<void(bool)>>* ack_callback) override {
EXPECT_FALSE(received_event_)
<< "Observer was not reset after receiving event.";
@@ -349,17 +349,15 @@ TEST_F(WindowTreeClientImplTest, InputEventBasic) {
scoped_ptr<ui::Event> ui_event(
new ui::MouseEvent(ui::ET_MOUSE_MOVED, gfx::Point(), gfx::Point(),
ui::EventTimeForNow(), ui::EF_NONE, 0));
- mojom::EventPtr mus_event = mojom::Event::From(*ui_event);
- setup.window_tree_client()->OnWindowInputEvent(1, root->id(),
- std::move(mus_event));
+ setup.window_tree_client()->OnWindowInputEvent(
+ 1, root->id(), mojom::Event::From(*ui_event.get()));
EXPECT_TRUE(event_handler.received_event());
EXPECT_TRUE(setup.window_tree()->WasEventAcked(1));
event_handler.Reset();
event_handler.set_should_manually_ack();
- mus_event = mojom::Event::From(*ui_event);
- setup.window_tree_client()->OnWindowInputEvent(33, root->id(),
- std::move(mus_event));
+ setup.window_tree_client()->OnWindowInputEvent(
+ 33, root->id(), mojom::Event::From(*ui_event.get()));
EXPECT_TRUE(event_handler.received_event());
EXPECT_FALSE(setup.window_tree()->WasEventAcked(33));

Powered by Google App Engine
This is Rietveld 408576698