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

Unified Diff: chrome/browser/chromeos/dbus/cros_dbus_service_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
Index: chrome/browser/chromeos/dbus/cros_dbus_service_unittest.cc
diff --git a/chrome/browser/chromeos/dbus/cros_dbus_service_unittest.cc b/chrome/browser/chromeos/dbus/cros_dbus_service_unittest.cc
index a3814ccc01c35b28a7494355b111f6bc18388b41..4ab293048316c606db519da2080e4b7431be17cd 100644
--- a/chrome/browser/chromeos/dbus/cros_dbus_service_unittest.cc
+++ b/chrome/browser/chromeos/dbus/cros_dbus_service_unittest.cc
@@ -42,7 +42,7 @@ class CrosDBusServiceTest : public testing::Test {
mock_bus_ = new dbus::MockBus(options);
// ShutdownAndBlock() will be called in TearDown().
- EXPECT_CALL(*mock_bus_, ShutdownAndBlock()).WillOnce(Return());
+ EXPECT_CALL(*mock_bus_.get(), ShutdownAndBlock()).WillOnce(Return());
// Create a mock exported object that behaves as
// org.chromium.CrosDBusService.
@@ -52,8 +52,8 @@ class CrosDBusServiceTest : public testing::Test {
// |mock_bus_|'s GetExportedObject() will return mock_exported_object_|
// for the given service name and the object path.
- EXPECT_CALL(*mock_bus_, GetExportedObject(
- dbus::ObjectPath(kLibCrosServicePath)))
+ EXPECT_CALL(*mock_bus_.get(),
+ GetExportedObject(dbus::ObjectPath(kLibCrosServicePath)))
.WillOnce(Return(mock_exported_object_.get()));
// Create a mock proxy resolution service.
@@ -65,7 +65,7 @@ class CrosDBusServiceTest : public testing::Test {
Start(Eq(mock_exported_object_))).WillOnce(Return());
// Initialize the cros service with the mocks injected.
CrosDBusService::InitializeForTesting(
- mock_bus_, mock_proxy_resolution_service_provider);
+ mock_bus_.get(), mock_proxy_resolution_service_provider);
}
virtual void TearDown() {

Powered by Google App Engine
This is Rietveld 408576698