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

Unified Diff: device/nfc/nfc_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 | « device/bluetooth/bluetooth_socket_chromeos.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/nfc/nfc_chromeos_unittest.cc
diff --git a/device/nfc/nfc_chromeos_unittest.cc b/device/nfc/nfc_chromeos_unittest.cc
index d748b789ee26f0291ac68486c180ac21911d2800..646940c7502a52ceba5b8eb97ddd04eda47f3127 100644
--- a/device/nfc/nfc_chromeos_unittest.cc
+++ b/device/nfc/nfc_chromeos_unittest.cc
@@ -61,34 +61,34 @@ class TestObserver : public NfcAdapter::Observer,
// NfcAdapter::Observer override.
virtual void AdapterPresentChanged(NfcAdapter* adapter,
bool present) OVERRIDE {
- EXPECT_EQ(adapter_, adapter);
+ EXPECT_EQ(adapter_.get(), adapter);
present_changed_count_++;
}
// NfcAdapter::Observer override.
virtual void AdapterPoweredChanged(NfcAdapter* adapter,
bool powered) OVERRIDE {
- EXPECT_EQ(adapter_, adapter);
+ EXPECT_EQ(adapter_.get(), adapter);
powered_changed_count_++;
}
// NfcAdapter::Observer override.
virtual void AdapterPollingChanged(NfcAdapter* adapter,
bool powered) OVERRIDE {
- EXPECT_EQ(adapter_, adapter);
+ EXPECT_EQ(adapter_.get(), adapter);
polling_changed_count_++;
}
// NfcAdapter::Observer override.
virtual void PeerFound(NfcAdapter* adapter, NfcPeer* peer) OVERRIDE {
- EXPECT_EQ(adapter_, adapter);
+ EXPECT_EQ(adapter_.get(), adapter);
peer_count_++;
peer_identifier_ = peer->GetIdentifier();
}
// NfcAdapter::Observer override.
virtual void PeerLost(NfcAdapter* adapter, NfcPeer* peer) OVERRIDE {
- EXPECT_EQ(adapter_, adapter);
+ EXPECT_EQ(adapter_.get(), adapter);
EXPECT_EQ(peer_identifier_, peer->GetIdentifier());
peer_count_--;
peer_identifier_.clear();
@@ -96,14 +96,14 @@ class TestObserver : public NfcAdapter::Observer,
// NfcAdapter::Observer override.
virtual void TagFound(NfcAdapter* adapter, NfcTag* tag) OVERRIDE {
- EXPECT_EQ(adapter_, adapter);
+ EXPECT_EQ(adapter_.get(), adapter);
tag_count_++;
tag_identifier_ = tag->GetIdentifier();
}
// NfcAdapter::Observer override.
virtual void TagLost(NfcAdapter* adapter, NfcTag* tag) OVERRIDE {
- EXPECT_EQ(adapter_, adapter);
+ EXPECT_EQ(adapter_.get(), adapter);
EXPECT_EQ(tag_identifier_, tag->GetIdentifier());
tag_count_--;
tag_identifier_.clear();
« no previous file with comments | « device/bluetooth/bluetooth_socket_chromeos.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698