Rename EventExecutor to InputInjector.

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.h"
@@ skipping 107 matching lines @@
 
   void ConnectTerminal(int terminal_id,
                        const ScreenResolution& resolution,
                        bool virtual_terminal);
   void DisconnectTerminal(int terminal_id);
 
   // Creates a DesktopEnvironment with a fake media::ScreenCapturer, to mock
   // DesktopEnvironmentFactory::Create().
   DesktopEnvironment* CreateDesktopEnvironment();
 
-  // Creates a dummy EventExecutor, to mock
-  // DesktopEnvironment::CreateEventExecutor().
-  EventExecutor* CreateEventExecutor();
+  // Creates a dummy InputInjector, to mock
+  // DesktopEnvironment::CreateInputInjector().
+  InputInjector* CreateInputInjector();
 
   // Creates a dummy SessionController, to mock
   // DesktopEnvironment::CreateSessionController().
   SessionController* CreateSessionController();
 
   // Creates a fake media::ScreenCapturer, to mock
   // DesktopEnvironment::CreateVideoCapturer().
   media::ScreenCapturer* CreateVideoCapturer();
 
   void DeleteDesktopEnvironment();
@@ skipping 36 matching lines @@
   std::string desktop_channel_name_;
 
   // Delegate that is passed to |desktop_channel_|.
   MockDaemonListener desktop_listener_;
 
   FakeDaemonSender daemon_channel_;
 
   scoped_ptr<IpcDesktopEnvironmentFactory> desktop_environment_factory_;
   scoped_ptr<DesktopEnvironment> desktop_environment_;
 
-  // The IPC event executor.
-  scoped_ptr<EventExecutor> event_executor_;
+  // The IPC input injector.
+  scoped_ptr<InputInjector> input_injector_;
 
   // The IPC screen capturer.
   scoped_ptr<media::ScreenCapturer> video_capturer_;
 
   // Represents the desktop process running in a user session.
   scoped_ptr<DesktopProcess> desktop_process_;
 
-  // Event executor owned by |desktop_process_|.
-  MockEventExecutor* remote_event_executor_;
+  // Input injector owned by |desktop_process_|.
+  MockInputInjector* remote_input_injector_;
 
   // The last |terminal_id| passed to ConnectTermina();
   int terminal_id_;
 
   media::MockScreenCapturerDelegate screen_capturer_delegate_;
 };
 
 IpcDesktopEnvironmentTest::IpcDesktopEnvironmentTest()
     : message_loop_(MessageLoop::TYPE_UI),
       clipboard_stub_(NULL),
-      remote_event_executor_(NULL),
+      remote_input_injector_(NULL),
       terminal_id_(-1) {
 }
 
 IpcDesktopEnvironmentTest::~IpcDesktopEnvironmentTest() {
 }
 
 void IpcDesktopEnvironmentTest::SetUp() {
   // Arrange to run |message_loop_| until no components depend on it.
   task_runner_ = new AutoThreadTaskRunner(
       message_loop_.message_loop_proxy(), main_run_loop_.QuitClosure());
@@ skipping 27 matching lines @@
                              &IpcDesktopEnvironmentTest::DisconnectTerminal));
 
   // Create a desktop environment instance.
   desktop_environment_factory_.reset(new IpcDesktopEnvironmentFactory(
       task_runner_, io_task_runner_, &daemon_channel_));
   desktop_environment_ = desktop_environment_factory_->Create(
       "user@domain/rest-of-jid",
       base::Bind(&IpcDesktopEnvironmentTest::OnDisconnectCallback,
                  base::Unretained(this)));
 
-  // Create the event executor.
-  event_executor_ =
-      desktop_environment_->CreateEventExecutor(task_runner_, task_runner_);
+  // Create the input injector.
+  input_injector_ =
+      desktop_environment_->CreateInputInjector(task_runner_, task_runner_);
 
   // Create the screen capturer.
   video_capturer_ =
       desktop_environment_->CreateVideoCapturer(task_runner_, task_runner_);
 }
 
 void IpcDesktopEnvironmentTest::ConnectTerminal(
     int terminal_id,
     const ScreenResolution& resolution,
     bool virtual_terminal) {
   EXPECT_NE(terminal_id_, terminal_id);
 
   terminal_id_ = terminal_id;
   CreateDesktopProcess();
 }
 
 void IpcDesktopEnvironmentTest::DisconnectTerminal(int terminal_id) {
   EXPECT_EQ(terminal_id_, terminal_id);
 
   // The IPC desktop environment is fully destroyed now. Release the remaining
   // task runners.
   desktop_environment_factory_.reset();
 }
 
 DesktopEnvironment* IpcDesktopEnvironmentTest::CreateDesktopEnvironment() {
   MockDesktopEnvironment* desktop_environment = new MockDesktopEnvironment();
   EXPECT_CALL(*desktop_environment, CreateAudioCapturerPtr(_))
       .Times(0);
-  EXPECT_CALL(*desktop_environment, CreateEventExecutorPtr(_, _))
+  EXPECT_CALL(*desktop_environment, CreateInputInjectorPtr(_, _))
       .Times(AnyNumber())
       .WillRepeatedly(
           InvokeWithoutArgs(this,
-                            &IpcDesktopEnvironmentTest::CreateEventExecutor));
+                            &IpcDesktopEnvironmentTest::CreateInputInjector));
   EXPECT_CALL(*desktop_environment, CreateSessionControllerPtr())
       .Times(AnyNumber())
       .WillRepeatedly(InvokeWithoutArgs(
           this, &IpcDesktopEnvironmentTest::CreateSessionController));
   EXPECT_CALL(*desktop_environment, CreateVideoCapturerPtr(_, _))
       .Times(AnyNumber())
       .WillRepeatedly(
           InvokeWithoutArgs(this,
                             &IpcDesktopEnvironmentTest::CreateVideoCapturer));
 
   // Let tests know that the remote desktop environment is created.
   message_loop_.PostTask(FROM_HERE, setup_run_loop_->QuitClosure());
 
   return desktop_environment;
 }
 
-EventExecutor* IpcDesktopEnvironmentTest::CreateEventExecutor() {
-  EXPECT_TRUE(remote_event_executor_ == NULL);
-  remote_event_executor_ = new MockEventExecutor();
+InputInjector* IpcDesktopEnvironmentTest::CreateInputInjector() {
+  EXPECT_TRUE(remote_input_injector_ == NULL);
+  remote_input_injector_ = new MockInputInjector();
 
-  EXPECT_CALL(*remote_event_executor_, StartPtr(_));
-  return remote_event_executor_;
+  EXPECT_CALL(*remote_input_injector_, StartPtr(_));
+  return remote_input_injector_;
 }
 
 SessionController* IpcDesktopEnvironmentTest::CreateSessionController() {
   return new MockSessionController();
 }
 
 media::ScreenCapturer* IpcDesktopEnvironmentTest::CreateVideoCapturer() {
   return new media::ScreenCapturerFake();
 }
 
 void IpcDesktopEnvironmentTest::DeleteDesktopEnvironment() {
-  event_executor_.reset();
+  input_injector_.reset();
   video_capturer_.reset();
 
   // Trigger DisconnectTerminal().
   desktop_environment_.reset();
 }
 
 void IpcDesktopEnvironmentTest::ReflectClipboardEvent(
     const protocol::ClipboardEvent& event) {
   clipboard_stub_->InjectClipboardEvent(event);
 }
@@ skipping 32 matching lines @@
   EXPECT_TRUE(desktop_process_->Start(
       desktop_environment_factory.PassAs<DesktopEnvironmentFactory>()));
 }
 
 void IpcDesktopEnvironmentTest::DestoyDesktopProcess() {
   desktop_channel_.reset();
   if (desktop_process_) {
     desktop_process_->OnChannelError();
     desktop_process_.reset();
   }
-  remote_event_executor_ = NULL;
+  remote_input_injector_ = NULL;
 }
 
 void IpcDesktopEnvironmentTest::OnDisconnectCallback() {
   DeleteDesktopEnvironment();
 }
 
 void IpcDesktopEnvironmentTest::OnDesktopAttached(
     IPC::PlatformFileForTransit desktop_pipe) {
 
   // Instruct DesktopSessionProxy to connect to the network-to-desktop pipe.
   desktop_environment_factory_->OnDesktopSessionAgentAttached(
       terminal_id_, base::GetCurrentProcessHandle(), desktop_pipe);
 }
 
 // Runs until the desktop is attached and exits immediately after that.
 TEST_F(IpcDesktopEnvironmentTest, Basic) {
   scoped_ptr<protocol::MockClipboardStub> clipboard_stub(
       new protocol::MockClipboardStub());
   EXPECT_CALL(*clipboard_stub, InjectClipboardEvent(_))
       .Times(0);
 
-  // Start the event executor and screen capturer.
-  event_executor_->Start(clipboard_stub.PassAs<protocol::ClipboardStub>());
+  // Start the input injector and screen capturer.
+  input_injector_->Start(clipboard_stub.PassAs<protocol::ClipboardStub>());
 
   // Run the message loop until the desktop is attached.
   setup_run_loop_->Run();
 
-  // Event executor should receive no events.
-  EXPECT_CALL(*remote_event_executor_, InjectClipboardEvent(_))
+  // Input injector should receive no events.
+  EXPECT_CALL(*remote_input_injector_, InjectClipboardEvent(_))
       .Times(0);
-  EXPECT_CALL(*remote_event_executor_, InjectKeyEvent(_))
+  EXPECT_CALL(*remote_input_injector_, InjectKeyEvent(_))
       .Times(0);
-  EXPECT_CALL(*remote_event_executor_, InjectMouseEvent(_))
+  EXPECT_CALL(*remote_input_injector_, InjectMouseEvent(_))
       .Times(0);
 
   // Stop the test.
   DeleteDesktopEnvironment();
 
   task_runner_ = NULL;
   io_task_runner_ = NULL;
   main_run_loop_.Run();
 }
 
 // Tests that the video capturer receives a frame over IPC.
 TEST_F(IpcDesktopEnvironmentTest, CaptureFrame) {
   scoped_ptr<protocol::MockClipboardStub> clipboard_stub(
       new protocol::MockClipboardStub());
   EXPECT_CALL(*clipboard_stub, InjectClipboardEvent(_))
       .Times(0);
 
-  // Start the event executor and screen capturer.
-  event_executor_->Start(clipboard_stub.PassAs<protocol::ClipboardStub>());
+  // Start the input injector and screen capturer.
+  input_injector_->Start(clipboard_stub.PassAs<protocol::ClipboardStub>());
   video_capturer_->Start(&screen_capturer_delegate_);
 
   // Run the message loop until the desktop is attached.
   setup_run_loop_->Run();
 
-  // Event executor should receive no events.
-  EXPECT_CALL(*remote_event_executor_, InjectClipboardEvent(_))
+  // Input injector should receive no events.
+  EXPECT_CALL(*remote_input_injector_, InjectClipboardEvent(_))
       .Times(0);
-  EXPECT_CALL(*remote_event_executor_, InjectKeyEvent(_))
+  EXPECT_CALL(*remote_input_injector_, InjectKeyEvent(_))
       .Times(0);
-  EXPECT_CALL(*remote_event_executor_, InjectMouseEvent(_))
+  EXPECT_CALL(*remote_input_injector_, InjectMouseEvent(_))
       .Times(0);
 
   // Stop the test when the first frame is captured.
   EXPECT_CALL(screen_capturer_delegate_, OnCaptureCompleted(_))
       .WillOnce(InvokeWithoutArgs(
           this, &IpcDesktopEnvironmentTest::DeleteDesktopEnvironment));
 
   // Capture a single frame.
   video_capturer_->CaptureFrame();
 
   task_runner_ = NULL;
   io_task_runner_ = NULL;
   main_run_loop_.Run();
 }
 
 // Tests that attaching to a new desktop works.
 TEST_F(IpcDesktopEnvironmentTest, Reattach) {
   scoped_ptr<protocol::MockClipboardStub> clipboard_stub(
       new protocol::MockClipboardStub());
   EXPECT_CALL(*clipboard_stub, InjectClipboardEvent(_))
       .Times(0);
 
-  // Start the event executor and screen capturer.
-  event_executor_->Start(clipboard_stub.PassAs<protocol::ClipboardStub>());
+  // Start the input injector and screen capturer.
+  input_injector_->Start(clipboard_stub.PassAs<protocol::ClipboardStub>());
   video_capturer_->Start(&screen_capturer_delegate_);
 
   // Run the message loop until the desktop is attached.
   setup_run_loop_->Run();
 
   // Create and start a new desktop process object.
   setup_run_loop_.reset(new base::RunLoop());
   DestoyDesktopProcess();
   CreateDesktopProcess();
   setup_run_loop_->Run();
 
-  // Event executor should receive no events.
-  EXPECT_CALL(*remote_event_executor_, InjectClipboardEvent(_))
+  // Input injector should receive no events.
+  EXPECT_CALL(*remote_input_injector_, InjectClipboardEvent(_))
       .Times(0);
-  EXPECT_CALL(*remote_event_executor_, InjectKeyEvent(_))
+  EXPECT_CALL(*remote_input_injector_, InjectKeyEvent(_))
       .Times(0);
-  EXPECT_CALL(*remote_event_executor_, InjectMouseEvent(_))
+  EXPECT_CALL(*remote_input_injector_, InjectMouseEvent(_))
       .Times(0);
 
   // Stop the test.
   DeleteDesktopEnvironment();
 
   task_runner_ = NULL;
   io_task_runner_ = NULL;
   main_run_loop_.Run();
 }
 
 // Tests InvalidateRegion().
 TEST_F(IpcDesktopEnvironmentTest, InvalidateRegion) {
   scoped_ptr<protocol::MockClipboardStub> clipboard_stub(
       new protocol::MockClipboardStub());
   EXPECT_CALL(*clipboard_stub, InjectClipboardEvent(_))
       .Times(0);
 
-  // Start the event executor and screen capturer.
-  event_executor_->Start(clipboard_stub.PassAs<protocol::ClipboardStub>());
+  // Start the input injector and screen capturer.
+  input_injector_->Start(clipboard_stub.PassAs<protocol::ClipboardStub>());
   video_capturer_->Start(&screen_capturer_delegate_);
 
   // Run the message loop until the desktop is attached.
   setup_run_loop_->Run();
 
-  // Event executor should receive no events.
-  EXPECT_CALL(*remote_event_executor_, InjectClipboardEvent(_))
+  // Input injector should receive no events.
+  EXPECT_CALL(*remote_input_injector_, InjectClipboardEvent(_))
       .Times(0);
-  EXPECT_CALL(*remote_event_executor_, InjectKeyEvent(_))
+  EXPECT_CALL(*remote_input_injector_, InjectKeyEvent(_))
       .Times(0);
-  EXPECT_CALL(*remote_event_executor_, InjectMouseEvent(_))
+  EXPECT_CALL(*remote_input_injector_, InjectMouseEvent(_))
       .Times(0);
 
   // Stop the test when the first frame is captured.
   EXPECT_CALL(screen_capturer_delegate_, OnCaptureCompleted(_))
       .WillOnce(InvokeWithoutArgs(
           this, &IpcDesktopEnvironmentTest::DeleteDesktopEnvironment));
 
   // Invalidate a region that is larger than the screen.
   SkIRect horizontal_rect = SkIRect::MakeXYWH(
       -100,
@@ skipping 24 matching lines @@
   scoped_ptr<protocol::MockClipboardStub> clipboard_stub(
       new protocol::MockClipboardStub());
   clipboard_stub_ = clipboard_stub.get();
 
   // Stop the test when a clipboard event is received from the desktop process.
   EXPECT_CALL(*clipboard_stub, InjectClipboardEvent(_))
       .Times(1)
       .WillOnce(InvokeWithoutArgs(
           this, &IpcDesktopEnvironmentTest::DeleteDesktopEnvironment));
 
-  // Start the event executor and screen capturer.
-  event_executor_->Start(clipboard_stub.PassAs<protocol::ClipboardStub>());
+  // Start the input injector and screen capturer.
+  input_injector_->Start(clipboard_stub.PassAs<protocol::ClipboardStub>());
   video_capturer_->Start(&screen_capturer_delegate_);
 
   // Run the message loop until the desktop is attached.
   setup_run_loop_->Run();
 
   // Expect a single clipboard event.
-  EXPECT_CALL(*remote_event_executor_, InjectClipboardEvent(_))
+  EXPECT_CALL(*remote_input_injector_, InjectClipboardEvent(_))
       .Times(1)
       .WillOnce(Invoke(this,
                        &IpcDesktopEnvironmentTest::ReflectClipboardEvent));
-  EXPECT_CALL(*remote_event_executor_, InjectKeyEvent(_))
+  EXPECT_CALL(*remote_input_injector_, InjectKeyEvent(_))
       .Times(0);
-  EXPECT_CALL(*remote_event_executor_, InjectMouseEvent(_))
+  EXPECT_CALL(*remote_input_injector_, InjectMouseEvent(_))
       .Times(0);
 
   // Send a clipboard event.
   protocol::ClipboardEvent event;
   event.set_mime_type(kMimeTypeTextUtf8);
   event.set_data("a");
-  event_executor_->InjectClipboardEvent(event);
+  input_injector_->InjectClipboardEvent(event);
 
   task_runner_ = NULL;
   io_task_runner_ = NULL;
   main_run_loop_.Run();
 }
 
 // Tests injection of key events.
 TEST_F(IpcDesktopEnvironmentTest, InjectKeyEvent) {
   scoped_ptr<protocol::MockClipboardStub> clipboard_stub(
       new protocol::MockClipboardStub());
   EXPECT_CALL(*clipboard_stub, InjectClipboardEvent(_))
       .Times(0);
 
-  // Start the event executor and screen capturer.
-  event_executor_->Start(clipboard_stub.PassAs<protocol::ClipboardStub>());
+  // Start the input injector and screen capturer.
+  input_injector_->Start(clipboard_stub.PassAs<protocol::ClipboardStub>());
   video_capturer_->Start(&screen_capturer_delegate_);
 
   // Run the message loop until the desktop is attached.
   setup_run_loop_->Run();
 
   // Expect a single key event.
-  EXPECT_CALL(*remote_event_executor_, InjectClipboardEvent(_))
+  EXPECT_CALL(*remote_input_injector_, InjectClipboardEvent(_))
       .Times(0);
-  EXPECT_CALL(*remote_event_executor_, InjectKeyEvent(_))
+  EXPECT_CALL(*remote_input_injector_, InjectKeyEvent(_))
       .Times(AtLeast(1))
       .WillRepeatedly(InvokeWithoutArgs(
           this, &IpcDesktopEnvironmentTest::DeleteDesktopEnvironment));
-  EXPECT_CALL(*remote_event_executor_, InjectMouseEvent(_))
+  EXPECT_CALL(*remote_input_injector_, InjectMouseEvent(_))
       .Times(0);
 
   // Send a key event.
   protocol::KeyEvent event;
   event.set_usb_keycode(0x070004);
   event.set_pressed(true);
-  event_executor_->InjectKeyEvent(event);
+  input_injector_->InjectKeyEvent(event);
 
   task_runner_ = NULL;
   io_task_runner_ = NULL;
   main_run_loop_.Run();
 }
 
 // Tests injection of mouse events.
 TEST_F(IpcDesktopEnvironmentTest, InjectMouseEvent) {
   scoped_ptr<protocol::MockClipboardStub> clipboard_stub(
       new protocol::MockClipboardStub());
   EXPECT_CALL(*clipboard_stub, InjectClipboardEvent(_))
       .Times(0);
 
-  // Start the event executor and screen capturer.
-  event_executor_->Start(clipboard_stub.PassAs<protocol::ClipboardStub>());
+  // Start the input injector and screen capturer.
+  input_injector_->Start(clipboard_stub.PassAs<protocol::ClipboardStub>());
   video_capturer_->Start(&screen_capturer_delegate_);
 
   // Run the message loop until the desktop is attached.
   setup_run_loop_->Run();
 
   // Expect a single mouse event.
-  EXPECT_CALL(*remote_event_executor_, InjectClipboardEvent(_))
+  EXPECT_CALL(*remote_input_injector_, InjectClipboardEvent(_))
       .Times(0);
-  EXPECT_CALL(*remote_event_executor_, InjectKeyEvent(_))
+  EXPECT_CALL(*remote_input_injector_, InjectKeyEvent(_))
       .Times(0);
-  EXPECT_CALL(*remote_event_executor_, InjectMouseEvent(_))
+  EXPECT_CALL(*remote_input_injector_, InjectMouseEvent(_))
       .Times(1)
       .WillOnce(InvokeWithoutArgs(
           this, &IpcDesktopEnvironmentTest::DeleteDesktopEnvironment));
 
   // Send a mouse event.
   protocol::MouseEvent event;
   event.set_x(0);
   event.set_y(0);
-  event_executor_->InjectMouseEvent(event);
+  input_injector_->InjectMouseEvent(event);
 
   task_runner_ = NULL;
   io_task_runner_ = NULL;
   main_run_loop_.Run();
 }
 
 }  // namespace remoting