| Index: remoting/host/client_session_unittest.cc
|
| diff --git a/remoting/host/client_session_unittest.cc b/remoting/host/client_session_unittest.cc
|
| index 0f0898e2a30e7c01570aa55ca7b4a09b85151251..2b3369650886ee8fb4b4c01a5d46a6d353de49df 100644
|
| --- a/remoting/host/client_session_unittest.cc
|
| +++ b/remoting/host/client_session_unittest.cc
|
| @@ -36,7 +36,7 @@ using protocol::MockClientStub;
|
| using protocol::MockHostStub;
|
| using protocol::MockInputStub;
|
| using protocol::MockSession;
|
| -using protocol::MockVideoStub;
|
| +using protocol::MockVideoSender;
|
| using protocol::SessionConfig;
|
|
|
| using testing::_;
|
| @@ -190,7 +190,7 @@ class ClientSessionTest : public testing::Test {
|
|
|
| // Stubs returned to |client_session_| components by |connection_|.
|
| MockClientStub client_stub_;
|
| - MockVideoStub video_stub_;
|
| + MockVideoSender video_sender_;
|
|
|
| // DesktopEnvironment owns |input_injector_|, but input injection tests need
|
| // to express expectations on it.
|
| @@ -242,7 +242,8 @@ void ClientSessionTest::CreateClientSession() {
|
| EXPECT_CALL(*connection, session()).WillRepeatedly(Return(session));
|
| EXPECT_CALL(*connection, client_stub())
|
| .WillRepeatedly(Return(&client_stub_));
|
| - EXPECT_CALL(*connection, video_stub()).WillRepeatedly(Return(&video_stub_));
|
| + EXPECT_CALL(*connection, video_sender())
|
| + .WillRepeatedly(Return(&video_sender_));
|
| EXPECT_CALL(*connection, Disconnect());
|
| connection_ = connection.get();
|
|
|
| @@ -370,7 +371,7 @@ TEST_F(ClientSessionTest, ClipboardStubFilter) {
|
| // the injected input will go though. Otherwise mouse events will be blocked
|
| // by the mouse clamping filter.
|
| Sequence s;
|
| - EXPECT_CALL(video_stub_, ProcessVideoPacketPtr(_, _))
|
| + EXPECT_CALL(video_sender_, ProcessVideoPacketPtr(_, _))
|
| .InSequence(s)
|
| .After(authenticated)
|
| .WillOnce(DoAll(
|
| @@ -437,7 +438,7 @@ TEST_F(ClientSessionTest, InputStubFilter) {
|
| // the injected input will go though. Otherwise mouse events will be blocked
|
| // by the mouse clamping filter.
|
| Sequence s;
|
| - EXPECT_CALL(video_stub_, ProcessVideoPacketPtr(_, _))
|
| + EXPECT_CALL(video_sender_, ProcessVideoPacketPtr(_, _))
|
| .InSequence(s)
|
| .After(authenticated)
|
| .WillOnce(DoAll(
|
| @@ -493,7 +494,7 @@ TEST_F(ClientSessionTest, LocalInputTest) {
|
| // the injected input will go though. Otherwise mouse events will be blocked
|
| // by the mouse clamping filter.
|
| Sequence s;
|
| - EXPECT_CALL(video_stub_, ProcessVideoPacketPtr(_, _))
|
| + EXPECT_CALL(video_sender_, ProcessVideoPacketPtr(_, _))
|
| .InSequence(s)
|
| .After(authenticated)
|
| .WillOnce(DoAll(
|
| @@ -551,7 +552,7 @@ TEST_F(ClientSessionTest, RestoreEventState) {
|
| // the injected input will go though. Otherwise mouse events will be blocked
|
| // by the mouse clamping filter.
|
| Sequence s;
|
| - EXPECT_CALL(video_stub_, ProcessVideoPacketPtr(_, _))
|
| + EXPECT_CALL(video_sender_, ProcessVideoPacketPtr(_, _))
|
| .InSequence(s)
|
| .After(authenticated)
|
| .WillOnce(DoAll(
|
| @@ -610,7 +611,7 @@ TEST_F(ClientSessionTest, ClampMouseEvents) {
|
| if (i == 0 && j == 0) {
|
| // Inject the 1st event once a video packet has been received.
|
| connected =
|
| - EXPECT_CALL(video_stub_, ProcessVideoPacketPtr(_, _))
|
| + EXPECT_CALL(video_sender_, ProcessVideoPacketPtr(_, _))
|
| .After(connected)
|
| .WillOnce(InjectMouseEvent(connection_, injected_event));
|
| } else {
|
| @@ -698,7 +699,7 @@ TEST_F(ClientSessionTest, ResetVideoPipeline) {
|
| EXPECT_CALL(session_event_handler_, OnSessionAuthenticated(_))
|
| .WillOnce(Return(true));
|
|
|
| - EXPECT_CALL(video_stub_, ProcessVideoPacketPtr(_, _))
|
| + EXPECT_CALL(video_sender_, ProcessVideoPacketPtr(_, _))
|
| .WillOnce(DoAll(
|
| InvokeWithoutArgs(this, &ClientSessionTest::DisconnectClientSession),
|
| InvokeWithoutArgs(this, &ClientSessionTest::StopClientSession)));
|
|
|