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

Unified Diff: content/browser/geolocation/wifi_data_provider_linux_unittest.cc

Issue 16294003: Update content/ 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, 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
Index: content/browser/geolocation/wifi_data_provider_linux_unittest.cc
diff --git a/content/browser/geolocation/wifi_data_provider_linux_unittest.cc b/content/browser/geolocation/wifi_data_provider_linux_unittest.cc
index 718fb5d85cc7335e85ee36162da97d362232f873..9a1a99d22d4de443991a4c82908d3e02c8724e32 100644
--- a/content/browser/geolocation/wifi_data_provider_linux_unittest.cc
+++ b/content/browser/geolocation/wifi_data_provider_linux_unittest.cc
@@ -39,12 +39,11 @@ class GeolocationWifiDataProviderLinuxTest : public testing::Test {
// Set an expectation so mock_network_manager_proxy_'s
// CallMethodAndBlock() will use CreateNetworkManagerProxyResponse()
// to return responses.
- EXPECT_CALL(*mock_network_manager_proxy_,
+ EXPECT_CALL(*mock_network_manager_proxy_.get(),
MockCallMethodAndBlock(_, _))
- .WillRepeatedly(Invoke(
- this,
- &GeolocationWifiDataProviderLinuxTest::
- CreateNetworkManagerProxyResponse));
+ .WillRepeatedly(Invoke(this,
+ &GeolocationWifiDataProviderLinuxTest::
+ CreateNetworkManagerProxyResponse));
// Create a mock proxy that behaves as NetworkManager/Devices/0.
mock_device_proxy_ =
@@ -52,11 +51,10 @@ class GeolocationWifiDataProviderLinuxTest : public testing::Test {
mock_bus_.get(),
"org.freedesktop.NetworkManager",
dbus::ObjectPath("/org/freedesktop/NetworkManager/Devices/0"));
- EXPECT_CALL(*mock_device_proxy_,
- MockCallMethodAndBlock(_, _))
+ EXPECT_CALL(*mock_device_proxy_.get(), MockCallMethodAndBlock(_, _))
.WillRepeatedly(Invoke(
- this,
- &GeolocationWifiDataProviderLinuxTest::CreateDeviceProxyResponse));
+ this,
+ &GeolocationWifiDataProviderLinuxTest::CreateDeviceProxyResponse));
// Create a mock proxy that behaves as NetworkManager/AccessPoint/0.
mock_access_point_proxy_ =
@@ -64,34 +62,37 @@ class GeolocationWifiDataProviderLinuxTest : public testing::Test {
mock_bus_.get(),
"org.freedesktop.NetworkManager",
dbus::ObjectPath("/org/freedesktop/NetworkManager/AccessPoint/0"));
- EXPECT_CALL(*mock_access_point_proxy_,
- MockCallMethodAndBlock(_, _))
- .WillRepeatedly(Invoke(
- this,
- &GeolocationWifiDataProviderLinuxTest::
- CreateAccessPointProxyResponse));
+ EXPECT_CALL(*mock_access_point_proxy_.get(), MockCallMethodAndBlock(_, _))
+ .WillRepeatedly(Invoke(this,
+ &GeolocationWifiDataProviderLinuxTest::
+ CreateAccessPointProxyResponse));
// Set an expectation so mock_bus_'s GetObjectProxy() for the given
// service name and the object path will return
// mock_network_manager_proxy_.
- EXPECT_CALL(*mock_bus_, GetObjectProxy(
- "org.freedesktop.NetworkManager",
- dbus::ObjectPath("/org/freedesktop/NetworkManager")))
+ EXPECT_CALL(
+ *mock_bus_.get(),
+ GetObjectProxy("org.freedesktop.NetworkManager",
+ dbus::ObjectPath("/org/freedesktop/NetworkManager")))
.WillOnce(Return(mock_network_manager_proxy_.get()));
// Likewise, set an expectation for mock_device_proxy_.
- EXPECT_CALL(*mock_bus_, GetObjectProxy(
- "org.freedesktop.NetworkManager",
- dbus::ObjectPath("/org/freedesktop/NetworkManager/Devices/0")))
+ EXPECT_CALL(
+ *mock_bus_.get(),
+ GetObjectProxy(
+ "org.freedesktop.NetworkManager",
+ dbus::ObjectPath("/org/freedesktop/NetworkManager/Devices/0")))
.WillOnce(Return(mock_device_proxy_.get()))
.WillOnce(Return(mock_device_proxy_.get()));
// Likewise, set an expectation for mock_access_point_proxy_.
- EXPECT_CALL(*mock_bus_, GetObjectProxy(
- "org.freedesktop.NetworkManager",
- dbus::ObjectPath("/org/freedesktop/NetworkManager/AccessPoint/0")))
+ EXPECT_CALL(
+ *mock_bus_.get(),
+ GetObjectProxy(
+ "org.freedesktop.NetworkManager",
+ dbus::ObjectPath("/org/freedesktop/NetworkManager/AccessPoint/0")))
.WillOnce(Return(mock_access_point_proxy_.get()));
// ShutdownAndBlock() should be called.
- EXPECT_CALL(*mock_bus_, ShutdownAndBlock()).WillOnce(Return());
+ EXPECT_CALL(*mock_bus_.get(), ShutdownAndBlock()).WillOnce(Return());
// Create the wlan API with the mock bus object injected.
wifi_provider_linux_ = new WifiDataProviderLinux;
« no previous file with comments | « content/browser/geolocation/network_location_request.cc ('k') | content/browser/gpu/browser_gpu_channel_host_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698