summaryrefslogtreecommitdiffstats
path: root/device/nfc
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2014-09-15 14:48:20 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-15 22:03:50 +0000
commit0761425c09c0d1f364095aa745f57b59b8843236 (patch)
tree824d6a861f632f5187b24768218a97f452b91c8c /device/nfc
parent30a7d44dd3fd802dc431671b6f065796d102a2d2 (diff)
downloadchromium_src-0761425c09c0d1f364095aa745f57b59b8843236.zip
chromium_src-0761425c09c0d1f364095aa745f57b59b8843236.tar.gz
chromium_src-0761425c09c0d1f364095aa745f57b59b8843236.tar.bz2
Remove implicit conversions from scoped_refptr to T* in device
This patch was generated by running the rewrite_scoped_refptr clang tool on a ChromeOS build. BUG=110610 Review URL: https://codereview.chromium.org/575503003 Cr-Commit-Position: refs/heads/master@{#294898}
Diffstat (limited to 'device/nfc')
-rw-r--r--device/nfc/nfc_chromeos_unittest.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/device/nfc/nfc_chromeos_unittest.cc b/device/nfc/nfc_chromeos_unittest.cc
index d748b78..646940c 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();