| Index: remoting/host/chromoting_host_unittest.cc
|
| diff --git a/remoting/host/chromoting_host_unittest.cc b/remoting/host/chromoting_host_unittest.cc
|
| index 2ff5b03f0ec0c44dd74243b047cbe9250978bfab..20c30c19da1c56a4699a56d99a7fd0723b7e9779 100644
|
| --- a/remoting/host/chromoting_host_unittest.cc
|
| +++ b/remoting/host/chromoting_host_unittest.cc
|
| @@ -139,9 +139,9 @@ class ChromotingHostTest : public testing::Test {
|
| session2_, &host_stub2_, &event_executor2_));
|
| connection2_ = owned_connection2_.get();
|
|
|
| - ON_CALL(video_stub_, ProcessVideoPacket(_, _))
|
| + ON_CALL(video_stub_, ProcessVideoPacketPtr(_, _))
|
| .WillByDefault(DeleteArg<0>());
|
| - ON_CALL(video_stub2_, ProcessVideoPacket(_, _))
|
| + ON_CALL(video_stub2_, ProcessVideoPacketPtr(_, _))
|
| .WillByDefault(DeleteArg<0>());
|
| ON_CALL(*connection_, video_stub())
|
| .WillByDefault(Return(&video_stub_));
|
| @@ -277,12 +277,12 @@ TEST_F(ChromotingHostTest, DISABLED_Connect) {
|
| InSequence s;
|
| EXPECT_CALL(*disconnect_window_, Show(_, _))
|
| .Times(0);
|
| - EXPECT_CALL(video_stub_, ProcessVideoPacket(_, _))
|
| + EXPECT_CALL(video_stub_, ProcessVideoPacketPtr(_, _))
|
| .WillOnce(DoAll(
|
| InvokeWithoutArgs(this, &ChromotingHostTest::ShutdownHost),
|
| RunDoneTask()))
|
| .RetiresOnSaturation();
|
| - EXPECT_CALL(video_stub_, ProcessVideoPacket(_, _))
|
| + EXPECT_CALL(video_stub_, ProcessVideoPacketPtr(_, _))
|
| .Times(AnyNumber());
|
| EXPECT_CALL(*connection_, Disconnect())
|
| .RetiresOnSaturation();
|
| @@ -300,14 +300,14 @@ TEST_F(ChromotingHostTest, DISABLED_Reconnect) {
|
| InSequence s;
|
| EXPECT_CALL(*disconnect_window_, Show(_, _))
|
| .Times(0);
|
| - EXPECT_CALL(video_stub_, ProcessVideoPacket(_, _))
|
| + EXPECT_CALL(video_stub_, ProcessVideoPacketPtr(_, _))
|
| .WillOnce(DoAll(
|
| InvokeWithoutArgs(this, &ChromotingHostTest::RemoveClientSession),
|
| RunDoneTask()))
|
| .RetiresOnSaturation();
|
| - EXPECT_CALL(video_stub_, ProcessVideoPacket(_, _))
|
| + EXPECT_CALL(video_stub_, ProcessVideoPacketPtr(_, _))
|
| .Times(AnyNumber());
|
| - EXPECT_CALL(video_stub_, ProcessVideoPacket(_, _))
|
| + EXPECT_CALL(video_stub_, ProcessVideoPacketPtr(_, _))
|
| .Times(AnyNumber());
|
| }
|
|
|
| @@ -324,12 +324,12 @@ TEST_F(ChromotingHostTest, DISABLED_Reconnect) {
|
| InSequence s;
|
| EXPECT_CALL(*disconnect_window_, Show(_, _))
|
| .Times(0);
|
| - EXPECT_CALL(video_stub_, ProcessVideoPacket(_, _))
|
| + EXPECT_CALL(video_stub_, ProcessVideoPacketPtr(_, _))
|
| .WillOnce(DoAll(
|
| InvokeWithoutArgs(this, &ChromotingHostTest::ShutdownHost),
|
| RunDoneTask()))
|
| .RetiresOnSaturation();
|
| - EXPECT_CALL(video_stub_, ProcessVideoPacket(_, _))
|
| + EXPECT_CALL(video_stub_, ProcessVideoPacketPtr(_, _))
|
| .Times(AnyNumber());
|
| }
|
|
|
| @@ -349,7 +349,7 @@ TEST_F(ChromotingHostTest, DISABLED_ConnectTwice) {
|
| InSequence s;
|
| EXPECT_CALL(*disconnect_window_, Show(_, _))
|
| .Times(0);
|
| - EXPECT_CALL(video_stub_, ProcessVideoPacket(_, _))
|
| + EXPECT_CALL(video_stub_, ProcessVideoPacketPtr(_, _))
|
| .WillOnce(DoAll(
|
| InvokeWithoutArgs(
|
| CreateFunctor(
|
| @@ -359,14 +359,14 @@ TEST_F(ChromotingHostTest, DISABLED_ConnectTwice) {
|
| .RetiresOnSaturation();
|
| EXPECT_CALL(*disconnect_window_, Show(_, _))
|
| .Times(0);
|
| - EXPECT_CALL(video_stub_, ProcessVideoPacket(_, _))
|
| + EXPECT_CALL(video_stub_, ProcessVideoPacketPtr(_, _))
|
| .Times(AnyNumber());
|
| - EXPECT_CALL(video_stub2_, ProcessVideoPacket(_, _))
|
| + EXPECT_CALL(video_stub2_, ProcessVideoPacketPtr(_, _))
|
| .WillOnce(DoAll(
|
| InvokeWithoutArgs(this, &ChromotingHostTest::ShutdownHost),
|
| RunDoneTask()))
|
| .RetiresOnSaturation();
|
| - EXPECT_CALL(video_stub2_, ProcessVideoPacket(_, _))
|
| + EXPECT_CALL(video_stub2_, ProcessVideoPacketPtr(_, _))
|
| .Times(AnyNumber());
|
| }
|
|
|
|
|