components/sync/driver/frontend_data_type_controller_unittest.cc - Issue 1302233003: Replace gmock's deprecated SetArgumentPointee with SetArgPointee.

Unified Diff: components/sync/driver/frontend_data_type_controller_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 | « components/sync/driver/async_directory_type_controller_unittest.cc ('k') | components/sync_bookmarks/bookmark_data_type_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/sync/driver/frontend_data_type_controller_unittest.cc

diff --git a/components/sync/driver/frontend_data_type_controller_unittest.cc b/components/sync/driver/frontend_data_type_controller_unittest.cc

index 7ca38ff62f19ab95b1c91e659c8b076781bf465c..73a0d33a0fbc85394d99ab99349dc8f43c300180 100644

--- a/components/sync/driver/frontend_data_type_controller_unittest.cc

+++ b/components/sync/driver/frontend_data_type_controller_unittest.cc

@@ -27,7 +27,7 @@ using testing::_;

using testing::DoAll;

using testing::InvokeWithoutArgs;

using testing::Return;

-using testing::SetArgumentPointee;

+using testing::SetArgPointee;

using testing::StrictMock;

namespace syncer {

@@ -89,7 +89,7 @@ class SyncFrontendDataTypeControllerTest : public testing::Test {

EXPECT_CALL(*model_associator_, CryptoReadyIfNecessary())

.WillOnce(Return(true));

EXPECT_CALL(*model_associator_, SyncModelHasUserCreatedNodes(_))

- .WillOnce(DoAll(SetArgumentPointee<0>(true), Return(true)));

+ .WillOnce(DoAll(SetArgPointee<0>(true), Return(true)));

EXPECT_CALL(*model_associator_, AssociateModels(_, _))

.WillOnce(Return(SyncError()));

EXPECT_CALL(*dtc_mock_.get(), RecordAssociationTime(_));

@@ -146,7 +146,7 @@ TEST_F(SyncFrontendDataTypeControllerTest, StartFirstRun) {

EXPECT_CALL(*model_associator_, CryptoReadyIfNecessary())

.WillOnce(Return(true));

EXPECT_CALL(*model_associator_, SyncModelHasUserCreatedNodes(_))

- .WillOnce(DoAll(SetArgumentPointee<0>(false), Return(true)));

+ .WillOnce(DoAll(SetArgPointee<0>(false), Return(true)));

EXPECT_CALL(*model_associator_, AssociateModels(_, _))

.WillOnce(Return(SyncError()));

EXPECT_CALL(*dtc_mock_.get(), RecordAssociationTime(_));

@@ -184,7 +184,7 @@ TEST_F(SyncFrontendDataTypeControllerTest, StartAssociationFailed) {

EXPECT_CALL(*model_associator_, CryptoReadyIfNecessary())

.WillOnce(Return(true));

EXPECT_CALL(*model_associator_, SyncModelHasUserCreatedNodes(_))

- .WillOnce(DoAll(SetArgumentPointee<0>(true), Return(true)));

+ .WillOnce(DoAll(SetArgPointee<0>(true), Return(true)));

EXPECT_CALL(*model_associator_, AssociateModels(_, _))

.WillOnce(Return(

SyncError(FROM_HERE, SyncError::DATATYPE_ERROR, "error", BOOKMARKS)));

@@ -205,7 +205,7 @@ TEST_F(SyncFrontendDataTypeControllerTest,

EXPECT_CALL(*model_associator_, CryptoReadyIfNecessary())

.WillRepeatedly(Return(true));

EXPECT_CALL(*model_associator_, SyncModelHasUserCreatedNodes(_))

- .WillRepeatedly(DoAll(SetArgumentPointee<0>(false), Return(false)));

+ .WillRepeatedly(DoAll(SetArgPointee<0>(false), Return(false)));

EXPECT_EQ(DataTypeController::NOT_RUNNING, frontend_dtc_->state());

Start();

EXPECT_EQ(DataTypeController::NOT_RUNNING, frontend_dtc_->state());