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

Unified Diff: device/bluetooth/bluez/bluetooth_advertisement_bluez_unittest.cc

Issue 1958823002: Fix implicit access to raw pointer of scoped_refptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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: device/bluetooth/bluez/bluetooth_advertisement_bluez_unittest.cc
diff --git a/device/bluetooth/bluez/bluetooth_advertisement_bluez_unittest.cc b/device/bluetooth/bluez/bluetooth_advertisement_bluez_unittest.cc
index 6ecb6f79f45b1ed7ebab00d768c3bddc2850b2a8..64a8183292f567ae9d7da98aa27420b467b8195f 100644
--- a/device/bluetooth/bluez/bluetooth_advertisement_bluez_unittest.cc
+++ b/device/bluetooth/bluez/bluetooth_advertisement_bluez_unittest.cc
@@ -200,7 +200,7 @@ class BluetoothAdvertisementBlueZTest : public testing::Test {
TEST_F(BluetoothAdvertisementBlueZTest, RegisterSucceeded) {
scoped_refptr<BluetoothAdvertisement> advertisement = CreateAdvertisement();
ExpectSuccess();
- EXPECT_NE(nullptr, advertisement);
+ EXPECT_TRUE(advertisement);
UnregisterAdvertisement(advertisement);
ExpectSuccess();
@@ -209,18 +209,18 @@ TEST_F(BluetoothAdvertisementBlueZTest, RegisterSucceeded) {
TEST_F(BluetoothAdvertisementBlueZTest, DoubleRegisterFailed) {
scoped_refptr<BluetoothAdvertisement> advertisement = CreateAdvertisement();
ExpectSuccess();
- EXPECT_NE(nullptr, advertisement);
+ EXPECT_TRUE(advertisement);
// Creating a second advertisement should give us an error.
scoped_refptr<BluetoothAdvertisement> advertisement2 = CreateAdvertisement();
ExpectError(BluetoothAdvertisement::ERROR_ADVERTISEMENT_ALREADY_EXISTS);
- EXPECT_EQ(nullptr, advertisement2);
+ EXPECT_FALSE(advertisement2);
}
TEST_F(BluetoothAdvertisementBlueZTest, DoubleUnregisterFailed) {
scoped_refptr<BluetoothAdvertisement> advertisement = CreateAdvertisement();
ExpectSuccess();
- EXPECT_NE(nullptr, advertisement);
+ EXPECT_FALSE(advertisement);
danakj 2016/05/10 21:37:02 TRUE
scheib 2016/05/10 22:25:00 Done.
UnregisterAdvertisement(advertisement);
ExpectSuccess();
@@ -234,7 +234,7 @@ TEST_F(BluetoothAdvertisementBlueZTest, DoubleUnregisterFailed) {
TEST_F(BluetoothAdvertisementBlueZTest, UnregisterAfterReleasedFailed) {
scoped_refptr<BluetoothAdvertisement> advertisement = CreateAdvertisement();
ExpectSuccess();
- EXPECT_NE(nullptr, advertisement);
+ EXPECT_TRUE(advertisement);
observer_.reset(new TestAdvertisementObserver(advertisement));
TriggerReleased(advertisement);

Powered by Google App Engine
This is Rietveld 408576698