replace OVERRIDE and FINAL with override and final in device/

BUG=417463

Review URL: https://codereview.chromium.org/628873002

Cr-Commit-Position: refs/heads/master@{#298289}

6 files changed, 53 insertions, 53 deletions

diff --git a/device/nfc/nfc_adapter_chromeos.h b/device/nfc/nfc_adapter_chromeos.h
index 3511e5d..4bf8fd9 100644
--- a/device/nfc/nfc_adapter_chromeos.h
+++ b/device/nfc/nfc_adapter_chromeos.h
@@ -29,19 +29,19 @@ class NfcAdapterChromeOS : public device::NfcAdapter,
                            public chromeos::NfcTagClient::Observer {
  public:
   // NfcAdapter overrides.
-  virtual void AddObserver(NfcAdapter::Observer* observer) OVERRIDE;
-  virtual void RemoveObserver(NfcAdapter::Observer* observer) OVERRIDE;
-  virtual bool IsPresent() const OVERRIDE;
-  virtual bool IsPowered() const OVERRIDE;
-  virtual bool IsPolling() const OVERRIDE;
-  virtual bool IsInitialized() const OVERRIDE;
+  virtual void AddObserver(NfcAdapter::Observer* observer) override;
+  virtual void RemoveObserver(NfcAdapter::Observer* observer) override;
+  virtual bool IsPresent() const override;
+  virtual bool IsPowered() const override;
+  virtual bool IsPolling() const override;
+  virtual bool IsInitialized() const override;
   virtual void SetPowered(bool powered,
                           const base::Closure& callback,
-                          const ErrorCallback& error_callback) OVERRIDE;
+                          const ErrorCallback& error_callback) override;
   virtual void StartPolling(const base::Closure& callback,
-                            const ErrorCallback& error_callback) OVERRIDE;
+                            const ErrorCallback& error_callback) override;
   virtual void StopPolling(const base::Closure& callback,
-                           const ErrorCallback& error_callback) OVERRIDE;
+                           const ErrorCallback& error_callback) override;
 
  private:
   friend class device::NfcAdapterFactory;
@@ -51,19 +51,19 @@ class NfcAdapterChromeOS : public device::NfcAdapter,
   virtual ~NfcAdapterChromeOS();
 
   // NfcAdapterClient::Observer overrides.
-  virtual void AdapterAdded(const dbus::ObjectPath& object_path) OVERRIDE;
-  virtual void AdapterRemoved(const dbus::ObjectPath& object_path) OVERRIDE;
+  virtual void AdapterAdded(const dbus::ObjectPath& object_path) override;
+  virtual void AdapterRemoved(const dbus::ObjectPath& object_path) override;
   virtual void AdapterPropertyChanged(
       const dbus::ObjectPath& object_path,
-      const std::string& property_name) OVERRIDE;
+      const std::string& property_name) override;
 
   // NfcDeviceClient::Observer overrides.
-  virtual void DeviceAdded(const dbus::ObjectPath& object_path) OVERRIDE;
-  virtual void DeviceRemoved(const dbus::ObjectPath& object_path) OVERRIDE;
+  virtual void DeviceAdded(const dbus::ObjectPath& object_path) override;
+  virtual void DeviceRemoved(const dbus::ObjectPath& object_path) override;
 
   // NfcTagClient::Observer overrides.
-  virtual void TagAdded(const dbus::ObjectPath& object_path) OVERRIDE;
-  virtual void TagRemoved(const dbus::ObjectPath& object_path) OVERRIDE;
+  virtual void TagAdded(const dbus::ObjectPath& object_path) override;
+  virtual void TagRemoved(const dbus::ObjectPath& object_path) override;
 
   // Set the tracked adapter to the one in |object_path|, this object will
   // subsequently operate on that adapter until it is removed.
diff --git a/device/nfc/nfc_chromeos_unittest.cc b/device/nfc/nfc_chromeos_unittest.cc
index 646940c..090f9da1 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_++;
diff --git a/device/nfc/nfc_peer_chromeos.h b/device/nfc/nfc_peer_chromeos.h
index eec8e4b..c4d8c58 100644
--- a/device/nfc/nfc_peer_chromeos.h
+++ b/device/nfc/nfc_peer_chromeos.h
@@ -21,16 +21,16 @@ class NfcPeerChromeOS : public device::NfcPeer,
                         public NfcRecordClient::Observer {
  public:
   // NfcPeer overrides.
-  virtual void AddObserver(device::NfcPeer::Observer* observer) OVERRIDE;
-  virtual void RemoveObserver(device::NfcPeer::Observer* observer) OVERRIDE;
-  virtual std::string GetIdentifier() const OVERRIDE;
-  virtual const device::NfcNdefMessage& GetNdefMessage() const OVERRIDE;
+  virtual void AddObserver(device::NfcPeer::Observer* observer) override;
+  virtual void RemoveObserver(device::NfcPeer::Observer* observer) override;
+  virtual std::string GetIdentifier() const override;
+  virtual const device::NfcNdefMessage& GetNdefMessage() const override;
   virtual void PushNdef(const device::NfcNdefMessage& message,
                         const base::Closure& callback,
-                        const ErrorCallback& error_callback) OVERRIDE;
+                        const ErrorCallback& error_callback) override;
   virtual void StartHandover(HandoverType handover_type,
                              const base::Closure& callback,
-                             const ErrorCallback& error_callback) OVERRIDE;
+                             const ErrorCallback& error_callback) override;
 
  private:
   friend class NfcAdapterChromeOS;
@@ -42,10 +42,10 @@ class NfcPeerChromeOS : public device::NfcPeer,
   virtual ~NfcPeerChromeOS();
 
   // NfcRecordClient::Observer overrides.
-  virtual void RecordAdded(const dbus::ObjectPath& object_path) OVERRIDE;
-  virtual void RecordRemoved(const dbus::ObjectPath& object_path) OVERRIDE;
+  virtual void RecordAdded(const dbus::ObjectPath& object_path) override;
+  virtual void RecordRemoved(const dbus::ObjectPath& object_path) override;
   virtual void RecordPropertiesReceived(
-      const dbus::ObjectPath& object_path) OVERRIDE;
+      const dbus::ObjectPath& object_path) override;
 
   // Called by dbus:: on completion of the D-Bus method call to push an NDEF.
   void OnPushNdef(const base::Closure& callback);
diff --git a/device/nfc/nfc_tag_chromeos.h b/device/nfc/nfc_tag_chromeos.h
index 5e4a723..29f7bfb 100644
--- a/device/nfc/nfc_tag_chromeos.h
+++ b/device/nfc/nfc_tag_chromeos.h
@@ -23,22 +23,22 @@ class NfcTagChromeOS : public device::NfcTag,
                        public NfcTagClient::Observer {
  public:
   // device::NfcTag overrides.
-  virtual void AddObserver(device::NfcTag::Observer* observer) OVERRIDE;
-  virtual void RemoveObserver(device::NfcTag::Observer* observer) OVERRIDE;
-  virtual std::string GetIdentifier() const OVERRIDE;
-  virtual TagType GetType() const OVERRIDE;
-  virtual bool IsReadOnly() const OVERRIDE;
-  virtual device::NfcTag::Protocol GetSupportedProtocol() const OVERRIDE;
+  virtual void AddObserver(device::NfcTag::Observer* observer) override;
+  virtual void RemoveObserver(device::NfcTag::Observer* observer) override;
+  virtual std::string GetIdentifier() const override;
+  virtual TagType GetType() const override;
+  virtual bool IsReadOnly() const override;
+  virtual device::NfcTag::Protocol GetSupportedProtocol() const override;
   virtual device::NfcTagTechnology::TechnologyTypeMask
-      GetSupportedTechnologies() const OVERRIDE;
-  virtual bool IsReady() const OVERRIDE;
-  virtual device::NfcNdefTagTechnology* GetNdefTagTechnology() OVERRIDE;
+      GetSupportedTechnologies() const override;
+  virtual bool IsReady() const override;
+  virtual device::NfcNdefTagTechnology* GetNdefTagTechnology() override;
 
   // NfcTagClient::Observer overrides.
   virtual void TagPropertyChanged(const dbus::ObjectPath& object_path,
-                                  const std::string& property_name) OVERRIDE;
+                                  const std::string& property_name) override;
   virtual void TagPropertiesReceived(
-      const dbus::ObjectPath& object_path) OVERRIDE;
+      const dbus::ObjectPath& object_path) override;
 
   // Object path representing the remote tag object.
   const dbus::ObjectPath& object_path() const { return object_path_; }
diff --git a/device/nfc/nfc_tag_technology.h b/device/nfc/nfc_tag_technology.h
index 35def12..45b3146 100644
--- a/device/nfc/nfc_tag_technology.h
+++ b/device/nfc/nfc_tag_technology.h
@@ -93,7 +93,7 @@ class NfcNdefTagTechnology : public NfcTagTechnology {
   virtual void RemoveObserver(Observer* observer) = 0;
 
   // NfcTagTechnology override.
-  virtual bool IsSupportedByTag() const OVERRIDE;
+  virtual bool IsSupportedByTag() const override;
 
   // Returns all NDEF records that were received from the tag in the form of an
   // NDEF message. If the returned NDEF message contains no records, this only
diff --git a/device/nfc/nfc_tag_technology_chromeos.h b/device/nfc/nfc_tag_technology_chromeos.h
index 71b070e..6f55f43 100644
--- a/device/nfc/nfc_tag_technology_chromeos.h
+++ b/device/nfc/nfc_tag_technology_chromeos.h
@@ -28,19 +28,19 @@ class NfcNdefTagTechnologyChromeOS : public device::NfcNdefTagTechnology,
 
   // device::NfcNdefTagTechnology overrides.
   virtual void AddObserver(device::NfcNdefTagTechnology::Observer* observer)
-    OVERRIDE;
+    override;
   virtual void RemoveObserver(device::NfcNdefTagTechnology::Observer* observer)
-    OVERRIDE;
-  virtual const device::NfcNdefMessage& GetNdefMessage() const OVERRIDE;
+    override;
+  virtual const device::NfcNdefMessage& GetNdefMessage() const override;
   virtual void WriteNdef(const device::NfcNdefMessage& message,
                          const base::Closure& callback,
-                         const ErrorCallback& error_callback) OVERRIDE;
+                         const ErrorCallback& error_callback) override;
 
   // NfcRecordClient::Observer overrides.
-  virtual void RecordAdded(const dbus::ObjectPath& object_path) OVERRIDE;
-  virtual void RecordRemoved(const dbus::ObjectPath& object_path) OVERRIDE;
+  virtual void RecordAdded(const dbus::ObjectPath& object_path) override;
+  virtual void RecordRemoved(const dbus::ObjectPath& object_path) override;
   virtual void RecordPropertiesReceived(
-      const dbus::ObjectPath& object_path) OVERRIDE;
+      const dbus::ObjectPath& object_path) override;
 
  private:
   friend class NfcTagChromeOS;