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

Unified Diff: device/nfc/nfc_chromeos_unittest.cc

Issue 628873002: replace OVERRIDE and FINAL with override and final in device/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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/nfc/nfc_adapter_chromeos.h ('k') | device/nfc/nfc_peer_chromeos.h » ('j') | 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 646940c7502a52ceba5b8eb97ddd04eda47f3127..090f9da15102e7fa09a0ac4120ba3352bd9fc0d5 100644
--- a/device/nfc/nfc_chromeos_unittest.cc
+++ b/device/nfc/nfc_chromeos_unittest.cc
@@ -60,34 +60,34 @@ class TestObserver : public NfcAdapter::Observer,
// NfcAdapter::Observer override.
virtual void AdapterPresentChanged(NfcAdapter* adapter,
- bool present) OVERRIDE {
+ bool present) override {
EXPECT_EQ(adapter_.get(), adapter);
present_changed_count_++;
}
// NfcAdapter::Observer override.
virtual void AdapterPoweredChanged(NfcAdapter* adapter,
- bool powered) OVERRIDE {
+ bool powered) override {
EXPECT_EQ(adapter_.get(), adapter);
powered_changed_count_++;
}
// NfcAdapter::Observer override.
virtual void AdapterPollingChanged(NfcAdapter* adapter,
- bool powered) OVERRIDE {
+ bool powered) override {
EXPECT_EQ(adapter_.get(), adapter);
polling_changed_count_++;
}
// NfcAdapter::Observer override.
- virtual void PeerFound(NfcAdapter* adapter, NfcPeer* peer) OVERRIDE {
+ virtual void PeerFound(NfcAdapter* adapter, NfcPeer* peer) override {
EXPECT_EQ(adapter_.get(), adapter);
peer_count_++;
peer_identifier_ = peer->GetIdentifier();
}
// NfcAdapter::Observer override.
- virtual void PeerLost(NfcAdapter* adapter, NfcPeer* peer) OVERRIDE {
+ virtual void PeerLost(NfcAdapter* adapter, NfcPeer* peer) override {
EXPECT_EQ(adapter_.get(), adapter);
EXPECT_EQ(peer_identifier_, peer->GetIdentifier());
peer_count_--;
@@ -95,14 +95,14 @@ class TestObserver : public NfcAdapter::Observer,
}
// NfcAdapter::Observer override.
- virtual void TagFound(NfcAdapter* adapter, NfcTag* tag) OVERRIDE {
+ virtual void TagFound(NfcAdapter* adapter, NfcTag* tag) override {
EXPECT_EQ(adapter_.get(), adapter);
tag_count_++;
tag_identifier_ = tag->GetIdentifier();
}
// NfcAdapter::Observer override.
- virtual void TagLost(NfcAdapter* adapter, NfcTag* tag) OVERRIDE {
+ virtual void TagLost(NfcAdapter* adapter, NfcTag* tag) override {
EXPECT_EQ(adapter_.get(), adapter);
EXPECT_EQ(tag_identifier_, tag->GetIdentifier());
tag_count_--;
@@ -111,7 +111,7 @@ class TestObserver : public NfcAdapter::Observer,
// NfcPeer::Observer override.
virtual void RecordReceived(
- NfcPeer* peer, const NfcNdefRecord* record) OVERRIDE {
+ NfcPeer* peer, const NfcNdefRecord* record) override {
EXPECT_EQ(peer, adapter_->GetPeer(peer_identifier_));
EXPECT_EQ(peer_identifier_, peer->GetIdentifier());
peer_records_received_count_++;
@@ -119,7 +119,7 @@ class TestObserver : public NfcAdapter::Observer,
// NfcNdefTagTechnology::Observer override.
virtual void RecordReceived(
- NfcTag* tag, const NfcNdefRecord* record) OVERRIDE {
+ NfcTag* tag, const NfcNdefRecord* record) override {
EXPECT_EQ(tag, adapter_->GetTag(tag_identifier_));
EXPECT_EQ(tag_identifier_, tag->GetIdentifier());
tag_records_received_count_++;
« no previous file with comments | « device/nfc/nfc_adapter_chromeos.h ('k') | device/nfc/nfc_peer_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698