Move all protocol event matchers to test_event_matchers.h

remoting/host/ipc_desktop_environment_unittest.cc

 // Copyright (c) 2013 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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 30 matching lines @@
 using testing::AtLeast;
 using testing::AtMost;
 using testing::DeleteArg;
 using testing::DoAll;
 using testing::InSequence;
 using testing::Return;
 using testing::ReturnRef;
 
 namespace remoting {
 
+using protocol::test::EqualsTouchEvent;
+using protocol::test::EqualsTouchEventTypeAndId;
+
 namespace {
 
 // Receives messages sent from the network process to the daemon.
 class FakeDaemonSender : public IPC::Sender {
  public:
   FakeDaemonSender() {}
   virtual ~FakeDaemonSender() {}
 
   // IPC::Sender implementation.
   virtual bool Send(IPC::Message* message) override;
@@ skipping 606 matching lines @@
   point->set_pressure(0.0f);
 
   ON_CALL(*remote_input_injector_, InjectTouchEvent(_))
       .WillByDefault(InvokeWithoutArgs(
           this, &IpcDesktopEnvironmentTest::DeleteDesktopEnvironment));
 
   InSequence s;
   // 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);
 
   task_runner_ = nullptr;
   io_task_runner_ = nullptr;
   main_run_loop_.Run();
 }
 
 // Tests that setting the desktop resolution works.
@@ skipping 19 matching lines @@
   screen_controls_->SetScreenResolution(ScreenResolution(
       webrtc::DesktopSize(100, 100),
       webrtc::DesktopVector(96, 96)));
 
   task_runner_ = nullptr;
   io_task_runner_ = nullptr;
   main_run_loop_.Run();
 }
 
 }  // namespace remoting