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

Unified Diff: chromeos/dbus/blocking_method_caller_unittest.cc

Issue 16998003: Update CrOS to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 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 | « chromeos/audio/cras_audio_handler.cc ('k') | chromeos/dbus/cros_disks_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/dbus/blocking_method_caller_unittest.cc
diff --git a/chromeos/dbus/blocking_method_caller_unittest.cc b/chromeos/dbus/blocking_method_caller_unittest.cc
index 2abfd642525555974c457327b35ba735933c5113..5102b62901010597a5a569c8f2ae39ad837cb11d 100644
--- a/chromeos/dbus/blocking_method_caller_unittest.cc
+++ b/chromeos/dbus/blocking_method_caller_unittest.cc
@@ -39,25 +39,24 @@ class BlockingMethodCallerTest : public testing::Test {
// Set an expectation so mock_proxy's CallMethodAndBlock() will use
// CreateMockProxyResponse() to return responses.
- EXPECT_CALL(*mock_proxy_, MockCallMethodAndBlock(_, _))
- .WillRepeatedly(Invoke(
- this, &BlockingMethodCallerTest::CreateMockProxyResponse));
+ EXPECT_CALL(*mock_proxy_.get(), MockCallMethodAndBlock(_, _))
+ .WillRepeatedly(
+ Invoke(this, &BlockingMethodCallerTest::CreateMockProxyResponse));
// 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(
- "org.chromium.TestService",
- dbus::ObjectPath("/org/chromium/TestObject")))
+ EXPECT_CALL(*mock_bus_.get(),
+ GetObjectProxy("org.chromium.TestService",
+ dbus::ObjectPath("/org/chromium/TestObject")))
.WillOnce(Return(mock_proxy_.get()));
// Set an expectation so mock_bus's PostTaskToDBusThread() will run the
// given task.
- EXPECT_CALL(*mock_bus_, PostTaskToDBusThread(_, _))
- .WillRepeatedly(Invoke(
- this, &BlockingMethodCallerTest::RunTask));
+ EXPECT_CALL(*mock_bus_.get(), PostTaskToDBusThread(_, _))
+ .WillRepeatedly(Invoke(this, &BlockingMethodCallerTest::RunTask));
// ShutdownAndBlock() will be called in TearDown().
- EXPECT_CALL(*mock_bus_, ShutdownAndBlock()).WillOnce(Return());
+ EXPECT_CALL(*mock_bus_.get(), ShutdownAndBlock()).WillOnce(Return());
}
virtual void TearDown() {
« no previous file with comments | « chromeos/audio/cras_audio_handler.cc ('k') | chromeos/dbus/cros_disks_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698