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

Unified Diff: media/filters/ffmpeg_glue_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/chunk_demuxer_unittest.cc ('k') | remoting/protocol/jingle_session_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_glue_unittest.cc
diff --git a/media/filters/ffmpeg_glue_unittest.cc b/media/filters/ffmpeg_glue_unittest.cc
index cda290e9695501eb81902a1d74b7523d0f22eab3..11f56f1a661d43e54a07ca7d78711fc1504bbd7f 100644
--- a/media/filters/ffmpeg_glue_unittest.cc
+++ b/media/filters/ffmpeg_glue_unittest.cc
@@ -23,7 +23,7 @@ using ::testing::_;
using ::testing::DoAll;
using ::testing::InSequence;
using ::testing::Return;
-using ::testing::SetArgumentPointee;
+using ::testing::SetArgPointee;
using ::testing::StrictMock;
namespace media {
@@ -174,7 +174,7 @@ TEST_F(FFmpegGlueTest, Seek) {
EXPECT_CALL(*protocol_, SetPosition(16))
.WillOnce(Return(true));
EXPECT_CALL(*protocol_, GetPosition(_))
- .WillOnce(DoAll(SetArgumentPointee<0>(8), Return(true)));
+ .WillOnce(DoAll(SetArgPointee<0>(8), Return(true)));
EXPECT_EQ(AVERROR(EIO), Seek(-16, SEEK_SET));
EXPECT_EQ(8, Seek(16, SEEK_SET));
@@ -185,16 +185,16 @@ TEST_F(FFmpegGlueTest, Seek) {
.WillOnce(Return(false));
EXPECT_CALL(*protocol_, GetPosition(_))
- .WillOnce(DoAll(SetArgumentPointee<0>(8), Return(true)));
+ .WillOnce(DoAll(SetArgPointee<0>(8), Return(true)));
EXPECT_CALL(*protocol_, SetPosition(16))
.WillOnce(Return(false));
EXPECT_CALL(*protocol_, GetPosition(_))
- .WillOnce(DoAll(SetArgumentPointee<0>(8), Return(true)));
+ .WillOnce(DoAll(SetArgPointee<0>(8), Return(true)));
EXPECT_CALL(*protocol_, SetPosition(16))
.WillOnce(Return(true));
EXPECT_CALL(*protocol_, GetPosition(_))
- .WillOnce(DoAll(SetArgumentPointee<0>(16), Return(true)));
+ .WillOnce(DoAll(SetArgPointee<0>(16), Return(true)));
EXPECT_EQ(AVERROR(EIO), Seek(8, SEEK_CUR));
EXPECT_EQ(AVERROR(EIO), Seek(8, SEEK_CUR));
@@ -206,16 +206,16 @@ TEST_F(FFmpegGlueTest, Seek) {
.WillOnce(Return(false));
EXPECT_CALL(*protocol_, GetSize(_))
- .WillOnce(DoAll(SetArgumentPointee<0>(16), Return(true)));
+ .WillOnce(DoAll(SetArgPointee<0>(16), Return(true)));
EXPECT_CALL(*protocol_, SetPosition(8))
.WillOnce(Return(false));
EXPECT_CALL(*protocol_, GetSize(_))
- .WillOnce(DoAll(SetArgumentPointee<0>(16), Return(true)));
+ .WillOnce(DoAll(SetArgPointee<0>(16), Return(true)));
EXPECT_CALL(*protocol_, SetPosition(8))
.WillOnce(Return(true));
EXPECT_CALL(*protocol_, GetPosition(_))
- .WillOnce(DoAll(SetArgumentPointee<0>(8), Return(true)));
+ .WillOnce(DoAll(SetArgPointee<0>(8), Return(true)));
EXPECT_EQ(AVERROR(EIO), Seek(-8, SEEK_END));
EXPECT_EQ(AVERROR(EIO), Seek(-8, SEEK_END));
@@ -226,7 +226,7 @@ TEST_F(FFmpegGlueTest, Seek) {
.WillOnce(Return(false));
EXPECT_CALL(*protocol_, GetSize(_))
- .WillOnce(DoAll(SetArgumentPointee<0>(16), Return(true)));
+ .WillOnce(DoAll(SetArgPointee<0>(16), Return(true)));
EXPECT_EQ(AVERROR(EIO), Seek(0, AVSEEK_SIZE));
EXPECT_EQ(16, Seek(0, AVSEEK_SIZE));
« no previous file with comments | « media/filters/chunk_demuxer_unittest.cc ('k') | remoting/protocol/jingle_session_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698