diff options
author | Ben Chan <benchan@chromium.org> | 2017-10-23 15:41:39 -0700 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2017-10-24 15:30:15 -0700 |
commit | 672c1f54a499a825cc0bb9bc4f240bf1887550d9 (patch) | |
tree | 3af8dfb6a3674a6df97f9b3957ffec786a06a4e2 /common_service_unittest.cc | |
parent | 8ad22ba0765dc6351bfd59da8c43e06476b56c01 (diff) |
update_engine: replace testing::SetArgumentPointee with testing::SetArgPointee
testing::SetArgumentPointee defined in gmock has been deprecated and
superseded by an equivalent testing::SetArgPointee.
BUG=chromium:777011
TEST=Run unit tests.
Change-Id: Ifc48897148d721e6f65159a54586e1fb456d75b9
Reviewed-on: https://chromium-review.googlesource.com/735213
Commit-Ready: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Diffstat (limited to 'common_service_unittest.cc')
-rw-r--r-- | common_service_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common_service_unittest.cc b/common_service_unittest.cc index 0a7bfc34..17265b9b 100644 --- a/common_service_unittest.cc +++ b/common_service_unittest.cc @@ -29,7 +29,7 @@ using std::string; using testing::Return; -using testing::SetArgumentPointee; +using testing::SetArgPointee; using testing::_; namespace chromeos_update_engine { @@ -82,7 +82,7 @@ TEST_F(UpdateEngineServiceTest, SetChannelWithDelegatedPolicy) { policy::MockDevicePolicy mock_device_policy; fake_system_state_.set_device_policy(&mock_device_policy); EXPECT_CALL(mock_device_policy, GetReleaseChannelDelegated(_)) - .WillOnce(DoAll(SetArgumentPointee<0>(true), Return(true))); + .WillOnce(DoAll(SetArgPointee<0>(true), Return(true))); EXPECT_CALL(*fake_system_state_.mock_request_params(), SetTargetChannel("beta-channel", true, _)) .WillOnce(Return(true)); |