Update {virtual,override,final} to follow C++11 style in device.

The Google style guide states that only one of {virtual,override,final}
should be used for each declaration, since override implies virtual and
final implies both virtual and override.

This patch was automatically generated with a ChromeOS build using a
variation of https://codereview.chromium.org/598073004.

BUG=417463
R=reillyg@chromium.org

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

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

5 files changed, 73 insertions, 83 deletions

diff --git a/device/nfc/nfc_adapter_chromeos.h b/device/nfc/nfc_adapter_chromeos.h
index 4bf8fd9..62ca341 100644
--- a/device/nfc/nfc_adapter_chromeos.h
+++ b/device/nfc/nfc_adapter_chromeos.h
@@ -29,41 +29,40 @@ 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 SetPowered(bool powered,
-                          const base::Closure& callback,
-                          const ErrorCallback& error_callback) override;
-  virtual void StartPolling(const base::Closure& callback,
-                            const ErrorCallback& error_callback) override;
-  virtual void StopPolling(const base::Closure& callback,
-                           const ErrorCallback& error_callback) override;
+  void AddObserver(NfcAdapter::Observer* observer) override;
+  void RemoveObserver(NfcAdapter::Observer* observer) override;
+  bool IsPresent() const override;
+  bool IsPowered() const override;
+  bool IsPolling() const override;
+  bool IsInitialized() const override;
+  void SetPowered(bool powered,
+                  const base::Closure& callback,
+                  const ErrorCallback& error_callback) override;
+  void StartPolling(const base::Closure& callback,
+                    const ErrorCallback& error_callback) override;
+  void StopPolling(const base::Closure& callback,
+                   const ErrorCallback& error_callback) override;
 
  private:
   friend class device::NfcAdapterFactory;
   friend class NfcChromeOSTest;
 
   NfcAdapterChromeOS();
-  virtual ~NfcAdapterChromeOS();
+  ~NfcAdapterChromeOS() override;
 
   // NfcAdapterClient::Observer overrides.
-  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;
+  void AdapterAdded(const dbus::ObjectPath& object_path) override;
+  void AdapterRemoved(const dbus::ObjectPath& object_path) override;
+  void AdapterPropertyChanged(const dbus::ObjectPath& object_path,
+                              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;
+  void DeviceAdded(const dbus::ObjectPath& object_path) override;
+  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;
+  void TagAdded(const dbus::ObjectPath& object_path) override;
+  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 090f9da1..0cf3ad9 100644
--- a/device/nfc/nfc_chromeos_unittest.cc
+++ b/device/nfc/nfc_chromeos_unittest.cc
@@ -56,38 +56,35 @@ class TestObserver : public NfcAdapter::Observer,
         adapter_(adapter) {
   }
 
-  virtual ~TestObserver() {}
+  ~TestObserver() override {}
 
   // NfcAdapter::Observer override.
-  virtual void AdapterPresentChanged(NfcAdapter* adapter,
-                                     bool present) override {
+  void AdapterPresentChanged(NfcAdapter* adapter, bool present) override {
     EXPECT_EQ(adapter_.get(), adapter);
     present_changed_count_++;
   }
 
   // NfcAdapter::Observer override.
-  virtual void AdapterPoweredChanged(NfcAdapter* adapter,
-                                     bool powered) override {
+  void AdapterPoweredChanged(NfcAdapter* adapter, bool powered) override {
     EXPECT_EQ(adapter_.get(), adapter);
     powered_changed_count_++;
   }
 
   // NfcAdapter::Observer override.
-  virtual void AdapterPollingChanged(NfcAdapter* adapter,
-                                     bool powered) override {
+  void AdapterPollingChanged(NfcAdapter* adapter, bool powered) override {
     EXPECT_EQ(adapter_.get(), adapter);
     polling_changed_count_++;
   }
 
   // NfcAdapter::Observer override.
-  virtual void PeerFound(NfcAdapter* adapter, NfcPeer* peer) override {
+  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 {
+  void PeerLost(NfcAdapter* adapter, NfcPeer* peer) override {
     EXPECT_EQ(adapter_.get(), adapter);
     EXPECT_EQ(peer_identifier_, peer->GetIdentifier());
     peer_count_--;
@@ -95,14 +92,14 @@ class TestObserver : public NfcAdapter::Observer,
   }
 
   // NfcAdapter::Observer override.
-  virtual void TagFound(NfcAdapter* adapter, NfcTag* tag) override {
+  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 {
+  void TagLost(NfcAdapter* adapter, NfcTag* tag) override {
     EXPECT_EQ(adapter_.get(), adapter);
     EXPECT_EQ(tag_identifier_, tag->GetIdentifier());
     tag_count_--;
@@ -110,16 +107,14 @@ class TestObserver : public NfcAdapter::Observer,
   }
 
   // NfcPeer::Observer override.
-  virtual void RecordReceived(
-      NfcPeer* peer, const NfcNdefRecord* record) override {
+  void RecordReceived(NfcPeer* peer, const NfcNdefRecord* record) override {
     EXPECT_EQ(peer, adapter_->GetPeer(peer_identifier_));
     EXPECT_EQ(peer_identifier_, peer->GetIdentifier());
     peer_records_received_count_++;
   }
 
   // NfcNdefTagTechnology::Observer override.
-  virtual void RecordReceived(
-        NfcTag* tag, const NfcNdefRecord* record) override {
+  void RecordReceived(NfcTag* tag, const NfcNdefRecord* record) override {
     EXPECT_EQ(tag, adapter_->GetTag(tag_identifier_));
     EXPECT_EQ(tag_identifier_, tag->GetIdentifier());
     tag_records_received_count_++;
@@ -141,7 +136,7 @@ class TestObserver : public NfcAdapter::Observer,
 
 class NfcChromeOSTest : public testing::Test {
  public:
-  virtual void SetUp() {
+  void SetUp() override {
     DBusThreadManager::Initialize();
     fake_nfc_adapter_client_ = static_cast<FakeNfcAdapterClient*>(
         DBusThreadManager::Get()->GetNfcAdapterClient());
@@ -159,7 +154,7 @@ class NfcChromeOSTest : public testing::Test {
     error_callback_count_ = 0;
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     adapter_ = NULL;
     DBusThreadManager::Shutdown();
   }
diff --git a/device/nfc/nfc_peer_chromeos.h b/device/nfc/nfc_peer_chromeos.h
index c4d8c58..db9e58b 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 PushNdef(const device::NfcNdefMessage& message,
-                        const base::Closure& callback,
-                        const ErrorCallback& error_callback) override;
-  virtual void StartHandover(HandoverType handover_type,
-                             const base::Closure& callback,
-                             const ErrorCallback& error_callback) override;
+  void AddObserver(device::NfcPeer::Observer* observer) override;
+  void RemoveObserver(device::NfcPeer::Observer* observer) override;
+  std::string GetIdentifier() const override;
+  const device::NfcNdefMessage& GetNdefMessage() const override;
+  void PushNdef(const device::NfcNdefMessage& message,
+                const base::Closure& callback,
+                const ErrorCallback& error_callback) override;
+  void StartHandover(HandoverType handover_type,
+                     const base::Closure& callback,
+                     const ErrorCallback& error_callback) override;
 
  private:
   friend class NfcAdapterChromeOS;
@@ -39,13 +39,12 @@ class NfcPeerChromeOS : public device::NfcPeer,
   typedef std::map<dbus::ObjectPath, device::NfcNdefRecord*> NdefRecordMap;
 
   explicit NfcPeerChromeOS(const dbus::ObjectPath& object_path);
-  virtual ~NfcPeerChromeOS();
+  ~NfcPeerChromeOS() override;
 
   // NfcRecordClient::Observer overrides.
-  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;
+  void RecordAdded(const dbus::ObjectPath& object_path) override;
+  void RecordRemoved(const dbus::ObjectPath& object_path) override;
+  void RecordPropertiesReceived(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 29f7bfb..acddcc5 100644
--- a/device/nfc/nfc_tag_chromeos.h
+++ b/device/nfc/nfc_tag_chromeos.h
@@ -23,22 +23,21 @@ 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 device::NfcTagTechnology::TechnologyTypeMask
-      GetSupportedTechnologies() const override;
-  virtual bool IsReady() const override;
-  virtual device::NfcNdefTagTechnology* GetNdefTagTechnology() override;
+  void AddObserver(device::NfcTag::Observer* observer) override;
+  void RemoveObserver(device::NfcTag::Observer* observer) override;
+  std::string GetIdentifier() const override;
+  TagType GetType() const override;
+  bool IsReadOnly() const override;
+  device::NfcTag::Protocol GetSupportedProtocol() const override;
+  device::NfcTagTechnology::TechnologyTypeMask GetSupportedTechnologies()
+      const override;
+  bool IsReady() const override;
+  device::NfcNdefTagTechnology* GetNdefTagTechnology() override;
 
   // NfcTagClient::Observer overrides.
-  virtual void TagPropertyChanged(const dbus::ObjectPath& object_path,
-                                  const std::string& property_name) override;
-  virtual void TagPropertiesReceived(
-      const dbus::ObjectPath& object_path) override;
+  void TagPropertyChanged(const dbus::ObjectPath& object_path,
+                          const std::string& property_name) override;
+  void TagPropertiesReceived(const dbus::ObjectPath& object_path) override;
 
   // Object path representing the remote tag object.
   const dbus::ObjectPath& object_path() const { return object_path_; }
@@ -47,7 +46,7 @@ class NfcTagChromeOS : public device::NfcTag,
   friend class NfcAdapterChromeOS;
 
   explicit NfcTagChromeOS(const dbus::ObjectPath& object_path);
-  virtual ~NfcTagChromeOS();
+  ~NfcTagChromeOS() override;
 
   // Object path of the tag that we are currently tracking.
   dbus::ObjectPath object_path_;
diff --git a/device/nfc/nfc_tag_technology_chromeos.h b/device/nfc/nfc_tag_technology_chromeos.h
index 6f55f43..1e78891 100644
--- a/device/nfc/nfc_tag_technology_chromeos.h
+++ b/device/nfc/nfc_tag_technology_chromeos.h
@@ -24,23 +24,21 @@ class NfcTagChromeOS;
 class NfcNdefTagTechnologyChromeOS : public device::NfcNdefTagTechnology,
                                      public NfcRecordClient::Observer {
  public:
-  virtual ~NfcNdefTagTechnologyChromeOS();
+  ~NfcNdefTagTechnologyChromeOS() override;
 
   // device::NfcNdefTagTechnology overrides.
-  virtual void AddObserver(device::NfcNdefTagTechnology::Observer* observer)
-    override;
-  virtual void RemoveObserver(device::NfcNdefTagTechnology::Observer* observer)
-    override;
-  virtual const device::NfcNdefMessage& GetNdefMessage() const override;
-  virtual void WriteNdef(const device::NfcNdefMessage& message,
-                         const base::Closure& callback,
-                         const ErrorCallback& error_callback) override;
+  void AddObserver(device::NfcNdefTagTechnology::Observer* observer) override;
+  void RemoveObserver(
+      device::NfcNdefTagTechnology::Observer* observer) override;
+  const device::NfcNdefMessage& GetNdefMessage() const override;
+  void WriteNdef(const device::NfcNdefMessage& message,
+                 const base::Closure& callback,
+                 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 RecordPropertiesReceived(
-      const dbus::ObjectPath& object_path) override;
+  void RecordAdded(const dbus::ObjectPath& object_path) override;
+  void RecordRemoved(const dbus::ObjectPath& object_path) override;
+  void RecordPropertiesReceived(const dbus::ObjectPath& object_path) override;
 
  private:
   friend class NfcTagChromeOS;