mus: Add EventObserver to allow passively listening to UI events

components/mus/ws/window_manager_state_unittest.cc

Index: components/mus/ws/window_manager_state_unittest.cc
diff --git a/components/mus/ws/window_manager_state_unittest.cc b/components/mus/ws/window_manager_state_unittest.cc
index 65fb48648e1e93e6a4a22abb096bd4dc93dce44f..4f5ca9cc6ca925458f6e131395cbfd38103812d7 100644
--- a/components/mus/ws/window_manager_state_unittest.cc
+++ b/components/mus/ws/window_manager_state_unittest.cc
@@ -9,7 +9,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/thread_task_runner_handle.h"
-#include "components/mus/public/cpp/event_matcher.h"
+#include "components/mus/public/cpp/event_matcher_util.h"
 #include "components/mus/surfaces/surfaces_state.h"
 #include "components/mus/ws/accelerator.h"
 #include "components/mus/ws/display_binding.h"
@@ -200,7 +200,7 @@ TEST_F(WindowManagerStateTest, NullAccelerator) {
   WindowTree* target_tree = tree();
   TestChangeTracker* tracker = wm_client()->tracker();
   EXPECT_EQ(1u, tracker->changes()->size());
-  EXPECT_EQ("InputEvent window=1,1 event_action=1",
+  EXPECT_EQ("InputEvent window=1,1 event_action=1 matched_observer=false",
             ChangesToDescription1(*tracker->changes())[0]);
 
   state->OnEventAck(target_tree, mojom::EventResult::UNHANDLED);
@@ -217,7 +217,7 @@ TEST_F(WindowManagerStateTest, PostTargetAccelerator) {
   DispatchInputEventToWindow(target, true, key, accelerator.get());
   TestChangeTracker* tracker = wm_client()->tracker();
   EXPECT_EQ(1u, tracker->changes()->size());
-  EXPECT_EQ("InputEvent window=1,1 event_action=1",
+  EXPECT_EQ("InputEvent window=1,1 event_action=1 matched_observer=false",
             ChangesToDescription1(*tracker->changes())[0]);
 
   window_manager_state()->OnEventAck(tree(), mojom::EventResult::UNHANDLED);
@@ -235,7 +235,7 @@ TEST_F(WindowManagerStateTest, ClientHandlesEvent) {
   DispatchInputEventToWindow(target, true, key, accelerator.get());
   TestChangeTracker* tracker = wm_client()->tracker();
   EXPECT_EQ(1u, tracker->changes()->size());
-  EXPECT_EQ("InputEvent window=1,1 event_action=1",
+  EXPECT_EQ("InputEvent window=1,1 event_action=1 matched_observer=false",
             ChangesToDescription1(*tracker->changes())[0]);
 
   window_manager_state()->OnEventAck(tree(), mojom::EventResult::HANDLED);
@@ -252,7 +252,7 @@ TEST_F(WindowManagerStateTest, AcceleratorDeleted) {
   DispatchInputEventToWindow(target, true, key, accelerator.get());
   TestChangeTracker* tracker = wm_client()->tracker();
   EXPECT_EQ(1u, tracker->changes()->size());
-  EXPECT_EQ("InputEvent window=1,1 event_action=1",
+  EXPECT_EQ("InputEvent window=1,1 event_action=1 matched_observer=false",
             ChangesToDescription1(*tracker->changes())[0]);
 
   accelerator.reset();
@@ -272,7 +272,7 @@ TEST_F(WindowManagerStateTest, EnqueuedAccelerators) {
   DispatchInputEventToWindow(target, true, key, accelerator.get());
   TestChangeTracker* tracker = wm_client()->tracker();
   EXPECT_EQ(1u, tracker->changes()->size());
-  EXPECT_EQ("InputEvent window=1,1 event_action=1",
+  EXPECT_EQ("InputEvent window=1,1 event_action=1 matched_observer=false",
             ChangesToDescription1(*tracker->changes())[0]);
 
   tracker->changes()->clear();
@@ -290,7 +290,7 @@ TEST_F(WindowManagerStateTest, EnqueuedAccelerators) {
   WindowTreeTestApi(target_tree).ClearAck();
   state->OnEventAck(target_tree, mojom::EventResult::UNHANDLED);
   EXPECT_EQ(1u, tracker->changes()->size());
-  EXPECT_EQ("InputEvent window=1,1 event_action=1",
+  EXPECT_EQ("InputEvent window=1,1 event_action=1 matched_observer=false",
             ChangesToDescription1(*tracker->changes())[0]);
   EXPECT_TRUE(window_manager()->on_accelerator_called());
   EXPECT_EQ(accelerator->id(), window_manager()->on_accelerator_id());
@@ -305,7 +305,7 @@ TEST_F(WindowManagerStateTest, DeleteTree) {
   DispatchInputEventToWindow(target, true, key, accelerator.get());
   TestChangeTracker* tracker = wm_client()->tracker();
   EXPECT_EQ(1u, tracker->changes()->size());
-  EXPECT_EQ("InputEvent window=1,1 event_action=1",
+  EXPECT_EQ("InputEvent window=1,1 event_action=1 matched_observer=false",
             ChangesToDescription1(*tracker->changes())[0]);
 
   window_manager_state()->OnWillDestroyTree(tree());
@@ -328,7 +328,7 @@ TEST_F(WindowManagerStateTest, DeleteNonRootTree) {
   DispatchInputEventToWindow(target, true, key, accelerator.get());
   TestChangeTracker* tracker = embed_connection->tracker();
   EXPECT_EQ(1u, tracker->changes()->size());
-  EXPECT_EQ("InputEvent window=2,1 event_action=1",
+  EXPECT_EQ("InputEvent window=2,1 event_action=1 matched_observer=false",
             ChangesToDescription1(*tracker->changes())[0]);
   EXPECT_TRUE(wm_client()->tracker()->changes()->empty());
 
@@ -344,7 +344,7 @@ TEST_F(WindowManagerStateTest, AckTimeout) {
   DispatchInputEventToWindow(window(), true, key, accelerator.get());
   TestChangeTracker* tracker = wm_client()->tracker();
   EXPECT_EQ(1u, tracker->changes()->size());
-  EXPECT_EQ("InputEvent window=1,1 event_action=1",
+  EXPECT_EQ("InputEvent window=1,1 event_action=1 matched_observer=false",
             ChangesToDescription1(*tracker->changes())[0]);
 
   OnEventAckTimeout();