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

Unified Diff: device/bluetooth/bluetooth_chromeos_unittest.cc

Issue 575503003: Remove implicit conversions from scoped_refptr to T* in device (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « no previous file | device/bluetooth/bluetooth_socket_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluetooth_chromeos_unittest.cc
diff --git a/device/bluetooth/bluetooth_chromeos_unittest.cc b/device/bluetooth/bluetooth_chromeos_unittest.cc
index 118499e905b8a6eb98894b3d879f6445841dca3e..e0838294947c2f64a880fc7a3cefd7f99b179d5c 100644
--- a/device/bluetooth/bluetooth_chromeos_unittest.cc
+++ b/device/bluetooth/bluetooth_chromeos_unittest.cc
@@ -56,7 +56,7 @@ class TestObserver : public BluetoothAdapter::Observer {
virtual void AdapterPresentChanged(BluetoothAdapter* adapter,
bool present) OVERRIDE {
- EXPECT_EQ(adapter_, adapter);
+ EXPECT_EQ(adapter_.get(), adapter);
++present_changed_count_;
last_present_ = present;
@@ -64,7 +64,7 @@ class TestObserver : public BluetoothAdapter::Observer {
virtual void AdapterPoweredChanged(BluetoothAdapter* adapter,
bool powered) OVERRIDE {
- EXPECT_EQ(adapter_, adapter);
+ EXPECT_EQ(adapter_.get(), adapter);
++powered_changed_count_;
last_powered_ = powered;
@@ -72,14 +72,14 @@ class TestObserver : public BluetoothAdapter::Observer {
virtual void AdapterDiscoverableChanged(BluetoothAdapter* adapter,
bool discoverable) OVERRIDE {
- EXPECT_EQ(adapter_, adapter);
+ EXPECT_EQ(adapter_.get(), adapter);
++discoverable_changed_count_;
}
virtual void AdapterDiscoveringChanged(BluetoothAdapter* adapter,
bool discovering) OVERRIDE {
- EXPECT_EQ(adapter_, adapter);
+ EXPECT_EQ(adapter_.get(), adapter);
++discovering_changed_count_;
last_discovering_ = discovering;
@@ -87,7 +87,7 @@ class TestObserver : public BluetoothAdapter::Observer {
virtual void DeviceAdded(BluetoothAdapter* adapter,
BluetoothDevice* device) OVERRIDE {
- EXPECT_EQ(adapter_, adapter);
+ EXPECT_EQ(adapter_.get(), adapter);
++device_added_count_;
last_device_ = device;
@@ -98,7 +98,7 @@ class TestObserver : public BluetoothAdapter::Observer {
virtual void DeviceChanged(BluetoothAdapter* adapter,
BluetoothDevice* device) OVERRIDE {
- EXPECT_EQ(adapter_, adapter);
+ EXPECT_EQ(adapter_.get(), adapter);
++device_changed_count_;
last_device_ = device;
@@ -109,7 +109,7 @@ class TestObserver : public BluetoothAdapter::Observer {
virtual void DeviceRemoved(BluetoothAdapter* adapter,
BluetoothDevice* device) OVERRIDE {
- EXPECT_EQ(adapter_, adapter);
+ EXPECT_EQ(adapter_.get(), adapter);
++device_removed_count_;
// Can't save device, it may be freed
« no previous file with comments | « no previous file | device/bluetooth/bluetooth_socket_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698