Move all protocol event matchers to test_event_matchers.h

remoting/host/ipc_desktop_environment_unittest.cc

Index: remoting/host/ipc_desktop_environment_unittest.cc
diff --git a/remoting/host/ipc_desktop_environment_unittest.cc b/remoting/host/ipc_desktop_environment_unittest.cc
index f1fee31b5523eee5196d701a5863f52aea4acfa4..d31d3d46acd51160f2aae5e3b6084cd03b66e202 100644
--- a/remoting/host/ipc_desktop_environment_unittest.cc
+++ b/remoting/host/ipc_desktop_environment_unittest.cc
@@ -48,6 +48,9 @@ using testing::ReturnRef;
 
 namespace remoting {
 
+using protocol::test::EqualsTouchEvent;
+using protocol::test::EqualsTouchEventTypeAndId;
+
 namespace {
 
 // Receives messages sent from the network process to the daemon.
@@ -674,9 +677,10 @@ TEST_F(IpcDesktopEnvironmentTest, InjectTouchEvent) {
   // Expect that the event gets propagated to remote_input_injector_.
   // And one more call for ReleaseAll().
   EXPECT_CALL(*remote_input_injector_,
-              InjectTouchEvent(protocol::TouchEventEqual(event)));
+              InjectTouchEvent(EqualsTouchEvent(event)));
   EXPECT_CALL(*remote_input_injector_,
-              InjectTouchEvent(protocol::IsTouchCancelEvent()));
+              InjectTouchEvent(EqualsTouchEventTypeAndId(
+                  protocol::TouchEvent::TOUCH_POINT_CANCEL, 0u)));
 
   // Send the touch event.
   input_injector_->InjectTouchEvent(event);