diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-14 07:30:38 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-14 07:30:38 +0000 |
| commit | 144b6c4d67fe81336112e4d702fb90c7aedb9bbf (patch) | |
| tree | ea4c040b17e2fdb754e0416749abd51b4937b991 /chromeos/dbus/shill_client_unittest_base.cc | |
| parent | 3c7ca2f02b64ba078a4aab208dc35d0a002fc168 (diff) | |
| download | chromium_src-144b6c4d67fe81336112e4d702fb90c7aedb9bbf.zip chromium_src-144b6c4d67fe81336112e4d702fb90c7aedb9bbf.tar.gz chromium_src-144b6c4d67fe81336112e4d702fb90c7aedb9bbf.tar.bz2 | |
Update CrOS to use scoped_refptr<T>::get() rather than implicit "operator T*"
BUG=110610
TBR=darin
Review URL: https://chromiumcodereview.appspot.com/16998003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206357 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/dbus/shill_client_unittest_base.cc')
| -rw-r--r-- | chromeos/dbus/shill_client_unittest_base.cc | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/chromeos/dbus/shill_client_unittest_base.cc b/chromeos/dbus/shill_client_unittest_base.cc index 1fa9b7f..9f52614 100644 --- a/chromeos/dbus/shill_client_unittest_base.cc +++ b/chromeos/dbus/shill_client_unittest_base.cc @@ -115,42 +115,41 @@ void ShillClientUnittestBase::SetUp() { // Set an expectation so mock_proxy's CallMethodAndBlock() will use // OnCallMethodAndBlock() to return responses. - EXPECT_CALL(*mock_proxy_, MockCallMethodAndBlock(_, _)) - .WillRepeatedly(Invoke( - this, &ShillClientUnittestBase::OnCallMethodAndBlock)); + EXPECT_CALL(*mock_proxy_.get(), MockCallMethodAndBlock(_, _)).WillRepeatedly( + Invoke(this, &ShillClientUnittestBase::OnCallMethodAndBlock)); // Set an expectation so mock_proxy's CallMethod() will use OnCallMethod() // to return responses. - EXPECT_CALL(*mock_proxy_, CallMethod(_, _, _)) + EXPECT_CALL(*mock_proxy_.get(), CallMethod(_, _, _)) .WillRepeatedly(Invoke(this, &ShillClientUnittestBase::OnCallMethod)); // Set an expectation so mock_proxy's CallMethodWithErrorCallback() will use // OnCallMethodWithErrorCallback() to return responses. - EXPECT_CALL(*mock_proxy_, CallMethodWithErrorCallback(_, _, _, _)) + EXPECT_CALL(*mock_proxy_.get(), CallMethodWithErrorCallback(_, _, _, _)) .WillRepeatedly(Invoke( - this, &ShillClientUnittestBase::OnCallMethodWithErrorCallback)); + this, &ShillClientUnittestBase::OnCallMethodWithErrorCallback)); // Set an expectation so mock_proxy's ConnectToSignal() will use // OnConnectToSignal() to run the callback. - EXPECT_CALL(*mock_proxy_, ConnectToSignal( - interface_name_, - flimflam::kMonitorPropertyChanged, _, _)) - .WillRepeatedly(Invoke(this, - &ShillClientUnittestBase::OnConnectToSignal)); + EXPECT_CALL( + *mock_proxy_.get(), + ConnectToSignal(interface_name_, flimflam::kMonitorPropertyChanged, _, _)) + .WillRepeatedly( + Invoke(this, &ShillClientUnittestBase::OnConnectToSignal)); // Set an expectation so mock_bus's GetObjectProxy() for the given // service name and the object path will return mock_proxy_. - EXPECT_CALL(*mock_bus_, GetObjectProxy(flimflam::kFlimflamServiceName, - object_path_)) + EXPECT_CALL(*mock_bus_.get(), + GetObjectProxy(flimflam::kFlimflamServiceName, object_path_)) .WillOnce(Return(mock_proxy_.get())); // Set an expectation so mock_bus's PostTaskToDBusThread() will run the // given task. - EXPECT_CALL(*mock_bus_, PostTaskToDBusThread(_, _)) + EXPECT_CALL(*mock_bus_.get(), PostTaskToDBusThread(_, _)) .WillRepeatedly(Invoke(&RunTask)); // ShutdownAndBlock() will be called in TearDown(). - EXPECT_CALL(*mock_bus_, ShutdownAndBlock()).WillOnce(Return()); + EXPECT_CALL(*mock_bus_.get(), ShutdownAndBlock()).WillOnce(Return()); } void ShillClientUnittestBase::TearDown() { |