Index: remoting/host/client_session_unittest.cc |
diff --git a/remoting/host/client_session_unittest.cc b/remoting/host/client_session_unittest.cc |
index f7b1fedb9572ddeb4db323bc8e6bbc6db8d98e30..6e76ab84df671cbd3642b3421afa1367f3b8695a 100644 |
--- a/remoting/host/client_session_unittest.cc |
+++ b/remoting/host/client_session_unittest.cc |
@@ -72,8 +72,8 @@ class ClientSessionTest : public testing::Test { |
DesktopEnvironment* CreateDesktopEnvironment(); |
// Returns |event_executor_| created and initialized by SetUp(), to mock |
alexeypa (please no reviews)
2013/03/22 21:19:38
nit: |input_injector_|.
|
- // DesktopEnvironment::CreateEventExecutor(). |
- EventExecutor* CreateEventExecutor( |
+ // DesktopEnvironment::CreateInputInjector(). |
+ InputInjector* CreateInputInjector( |
scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, |
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner); |
@@ -115,7 +115,7 @@ class ClientSessionTest : public testing::Test { |
// DesktopEnvironment owns |event_executor_|, but input injection tests need |
// to express expectations on it. |
- scoped_ptr<MockEventExecutor> event_executor_; |
+ scoped_ptr<MockInputInjector> event_executor_; |
alexeypa (please no reviews)
2013/03/22 21:19:38
nit: |input_injector_|.
|
// ClientSession owns |connection_| but tests need it to inject fake events. |
MockConnectionToClient* connection_; |
@@ -139,7 +139,7 @@ void ClientSessionTest::SetUp() { |
.Times(AnyNumber()) |
.WillRepeatedly(Return(false)); |
- event_executor_.reset(new MockEventExecutor()); |
+ event_executor_.reset(new MockInputInjector()); |
session_config_ = SessionConfig::ForTest(); |
@@ -195,8 +195,8 @@ DesktopEnvironment* ClientSessionTest::CreateDesktopEnvironment() { |
MockDesktopEnvironment* desktop_environment = new MockDesktopEnvironment(); |
EXPECT_CALL(*desktop_environment, CreateAudioCapturerPtr(_)) |
.Times(0); |
- EXPECT_CALL(*desktop_environment, CreateEventExecutorPtr(_, _)) |
- .WillOnce(Invoke(this, &ClientSessionTest::CreateEventExecutor)); |
+ EXPECT_CALL(*desktop_environment, CreateInputInjectorPtr(_, _)) |
+ .WillOnce(Invoke(this, &ClientSessionTest::CreateInputInjector)); |
EXPECT_CALL(*desktop_environment, CreateSessionControllerPtr()) |
.WillOnce(Invoke(this, &ClientSessionTest::CreateSessionController)); |
EXPECT_CALL(*desktop_environment, CreateVideoCapturerPtr(_, _)) |
@@ -205,7 +205,7 @@ DesktopEnvironment* ClientSessionTest::CreateDesktopEnvironment() { |
return desktop_environment; |
} |
-EventExecutor* ClientSessionTest::CreateEventExecutor( |
+InputInjector* ClientSessionTest::CreateInputInjector( |
scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, |
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { |
EXPECT_TRUE(event_executor_); |