Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(347)

Unified Diff: remoting/protocol/jingle_session_unittest.cc

Issue 1302233003: Replace gmock's deprecated SetArgumentPointee with SetArgPointee. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 2017 Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/ffmpeg_glue_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/jingle_session_unittest.cc
diff --git a/remoting/protocol/jingle_session_unittest.cc b/remoting/protocol/jingle_session_unittest.cc
index 2c3c61ba866c135c95faf63045092215d57be4b9..8538c8d281dda4a7f9e8756bc32e7570a961c974 100644
--- a/remoting/protocol/jingle_session_unittest.cc
+++ b/remoting/protocol/jingle_session_unittest.cc
@@ -44,7 +44,7 @@ using testing::Invoke;
using testing::InvokeWithoutArgs;
using testing::Return;
using testing::SaveArg;
-using testing::SetArgumentPointee;
+using testing::SetArgPointee;
using testing::WithArg;
namespace remoting {
@@ -223,7 +223,7 @@ class JingleSessionTest : public testing::Test {
EXPECT_CALL(host_server_listener_, OnIncomingSession(_, _))
.WillOnce(
DoAll(WithArg<0>(Invoke(this, &JingleSessionTest::SetHostSession)),
- SetArgumentPointee<1>(protocol::SessionManager::ACCEPT)));
+ SetArgPointee<1>(protocol::SessionManager::ACCEPT)));
{
InSequence dummy;
@@ -357,7 +357,7 @@ TEST_F(JingleSessionTest, RejectConnection) {
// Reject incoming session.
EXPECT_CALL(host_server_listener_, OnIncomingSession(_, _))
- .WillOnce(SetArgumentPointee<1>(protocol::SessionManager::DECLINE));
+ .WillOnce(SetArgPointee<1>(protocol::SessionManager::DECLINE));
{
InSequence dummy;
@@ -497,9 +497,9 @@ TEST_F(JingleSessionTest, DeleteSessionOnIncomingConnection) {
CreateSessionManagers(auth_config);
EXPECT_CALL(host_server_listener_, OnIncomingSession(_, _))
- .WillOnce(DoAll(
- WithArg<0>(Invoke(this, &JingleSessionTest::SetHostSession)),
- SetArgumentPointee<1>(protocol::SessionManager::ACCEPT)));
+ .WillOnce(
+ DoAll(WithArg<0>(Invoke(this, &JingleSessionTest::SetHostSession)),
+ SetArgPointee<1>(protocol::SessionManager::ACCEPT)));
EXPECT_CALL(host_session_event_handler_,
OnSessionStateChange(Session::ACCEPTED))
@@ -526,7 +526,7 @@ TEST_F(JingleSessionTest, DeleteSessionOnAuth) {
EXPECT_CALL(host_server_listener_, OnIncomingSession(_, _))
.WillOnce(
DoAll(WithArg<0>(Invoke(this, &JingleSessionTest::SetHostSession)),
- SetArgumentPointee<1>(protocol::SessionManager::ACCEPT)));
+ SetArgPointee<1>(protocol::SessionManager::ACCEPT)));
EXPECT_CALL(host_session_event_handler_,
OnSessionStateChange(Session::ACCEPTED))
« no previous file with comments | « media/filters/ffmpeg_glue_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698