Index: remoting/host/client_session_unittest.cc |
diff --git a/remoting/host/client_session_unittest.cc b/remoting/host/client_session_unittest.cc |
index 81a3b6f0bf42c7fc93ff4b3278954f71744adc31..bb12f65833c59194380a6a6f9bca8a39bb2d4a0a 100644 |
--- a/remoting/host/client_session_unittest.cc |
+++ b/remoting/host/client_session_unittest.cc |
@@ -332,8 +332,7 @@ void ClientSessionTest::SetSendMessageAndDisconnectExpectation( |
message.set_data("data"); |
Expectation authenticated = |
- EXPECT_CALL(session_event_handler_, OnSessionAuthenticated(_)) |
- .WillOnce(Return(true)); |
+ EXPECT_CALL(session_event_handler_, OnSessionAuthenticated(_)); |
EXPECT_CALL(session_event_handler_, OnSessionChannelsConnected(_)) |
.After(authenticated) |
.WillOnce(DoAll( |
@@ -345,8 +344,7 @@ void ClientSessionTest::SetSendMessageAndDisconnectExpectation( |
TEST_F(ClientSessionTest, ClipboardStubFilter) { |
CreateClientSession(); |
- EXPECT_CALL(session_event_handler_, OnSessionAuthenticated(_)) |
- .WillOnce(Return(true)); |
+ EXPECT_CALL(session_event_handler_, OnSessionAuthenticated(_)); |
EXPECT_CALL(*input_injector_, StartPtr(_)); |
EXPECT_CALL(session_event_handler_, OnSessionChannelsConnected(_)); |
@@ -451,8 +449,7 @@ TEST_F(ClientSessionTest, LocalInputTest) { |
mouse_event3.set_y(301); |
Expectation authenticated = |
- EXPECT_CALL(session_event_handler_, OnSessionAuthenticated(_)) |
- .WillOnce(Return(true)); |
+ EXPECT_CALL(session_event_handler_, OnSessionAuthenticated(_)); |
EXPECT_CALL(*input_injector_, StartPtr(_)) |
.After(authenticated); |
EXPECT_CALL(session_event_handler_, OnSessionChannelsConnected(_)) |
@@ -508,8 +505,7 @@ TEST_F(ClientSessionTest, RestoreEventState) { |
mousedown.set_button_down(true); |
Expectation authenticated = |
- EXPECT_CALL(session_event_handler_, OnSessionAuthenticated(_)) |
- .WillOnce(Return(true)); |
+ EXPECT_CALL(session_event_handler_, OnSessionAuthenticated(_)); |
EXPECT_CALL(*input_injector_, StartPtr(_)).After(authenticated); |
EXPECT_CALL(session_event_handler_, OnSessionChannelsConnected(_)) |
.After(authenticated); |
@@ -549,8 +545,7 @@ TEST_F(ClientSessionTest, ClampMouseEvents) { |
CreateClientSession(); |
Expectation authenticated = |
- EXPECT_CALL(session_event_handler_, OnSessionAuthenticated(_)) |
- .WillOnce(Return(true)); |
+ EXPECT_CALL(session_event_handler_, OnSessionAuthenticated(_)); |
EXPECT_CALL(*input_injector_, StartPtr(_)).After(authenticated); |
EXPECT_CALL(session_event_handler_, OnSessionChannelsConnected(_)) |
.After(authenticated); |
@@ -611,8 +606,7 @@ TEST_F(ClientSessionTest, NoGnubbyAuth) { |
message.set_data("test"); |
Expectation authenticated = |
- EXPECT_CALL(session_event_handler_, OnSessionAuthenticated(_)) |
- .WillOnce(Return(true)); |
+ EXPECT_CALL(session_event_handler_, OnSessionAuthenticated(_)); |
EXPECT_CALL(*input_injector_, StartPtr(_)).After(authenticated); |
EXPECT_CALL(session_event_handler_, OnSessionChannelsConnected(_)) |
.After(authenticated) |
@@ -636,8 +630,7 @@ TEST_F(ClientSessionTest, EnableGnubbyAuth) { |
message.set_data("test"); |
Expectation authenticated = |
- EXPECT_CALL(session_event_handler_, OnSessionAuthenticated(_)) |
- .WillOnce(Return(true)); |
+ EXPECT_CALL(session_event_handler_, OnSessionAuthenticated(_)); |
EXPECT_CALL(*input_injector_, StartPtr(_)).After(authenticated); |
EXPECT_CALL(session_event_handler_, OnSessionChannelsConnected(_)) |
.After(authenticated) |
@@ -657,8 +650,7 @@ TEST_F(ClientSessionTest, EnableGnubbyAuth) { |
TEST_F(ClientSessionTest, ResetVideoPipeline) { |
CreateClientSession(); |
- EXPECT_CALL(session_event_handler_, OnSessionAuthenticated(_)) |
- .WillOnce(Return(true)); |
+ EXPECT_CALL(session_event_handler_, OnSessionAuthenticated(_)); |
EXPECT_CALL(video_stub_, ProcessVideoPacketPtr(_, _)) |
.WillOnce(DoAll( |
@@ -689,8 +681,7 @@ TEST_F(ClientSessionTest, Extensions) { |
CreateClientSession(); |
Expectation authenticated = |
- EXPECT_CALL(session_event_handler_, OnSessionAuthenticated(_)) |
- .WillOnce(Return(true)); |
+ EXPECT_CALL(session_event_handler_, OnSessionAuthenticated(_)); |
// Verify that the ClientSession reports the correct capabilities, and mimic |
// the client reporting an overlapping set of capabilities. |
@@ -745,8 +736,7 @@ TEST_F(ClientSessionTest, StealVideoCapturer) { |
SetMatchCapabilitiesExpectation(); |
- EXPECT_CALL(session_event_handler_, OnSessionAuthenticated(_)) |
- .WillOnce(Return(true)); |
+ EXPECT_CALL(session_event_handler_, OnSessionAuthenticated(_)); |
ConnectClientSession(); |