replace OVERRIDE and FINAL with override and final in chromeos/

chromeos/dbus/nfc_record_client.cc

Index: chromeos/dbus/nfc_record_client.cc
diff --git a/chromeos/dbus/nfc_record_client.cc b/chromeos/dbus/nfc_record_client.cc
index f0bbd9bdc1f0ec24fc835260e8b6a0f9aca947fa..334a1740a2529a46ab8238f37dded207867fc8e6 100644
--- a/chromeos/dbus/nfc_record_client.cc
+++ b/chromeos/dbus/nfc_record_client.cc
@@ -60,19 +60,19 @@ class NfcRecordClientImpl : public NfcRecordClient,
   }
 
   // NfcRecordClient override.
-  virtual void AddObserver(NfcRecordClient::Observer* observer) OVERRIDE {
+  virtual void AddObserver(NfcRecordClient::Observer* observer) override {
     DCHECK(observer);
     observers_.AddObserver(observer);
   }
 
   // NfcRecordClient override.
-  virtual void RemoveObserver(NfcRecordClient::Observer* observer) OVERRIDE {
+  virtual void RemoveObserver(NfcRecordClient::Observer* observer) override {
     DCHECK(observer);
     observers_.RemoveObserver(observer);
   }
 
   virtual std::vector<dbus::ObjectPath> GetRecordsForDevice(
-      const dbus::ObjectPath& device_path) OVERRIDE {
+      const dbus::ObjectPath& device_path) override {
     DBusObjectMap* object_map =
         devices_and_tags_to_object_maps_.GetObjectMap(device_path);
     if (!object_map)
@@ -81,20 +81,20 @@ class NfcRecordClientImpl : public NfcRecordClient,
   }
 
   virtual std::vector<dbus::ObjectPath> GetRecordsForTag(
-      const dbus::ObjectPath& tag_path) OVERRIDE {
+      const dbus::ObjectPath& tag_path) override {
     return GetRecordsForDevice(tag_path);
   }
 
   // NfcRecordClient override.
   virtual Properties* GetProperties(
-      const dbus::ObjectPath& object_path) OVERRIDE {
+      const dbus::ObjectPath& object_path) override {
     return static_cast<Properties*>(
         devices_and_tags_to_object_maps_.FindObjectProperties(object_path));
   }
 
  protected:
   // DBusClient override.
-  virtual void Init(dbus::Bus* bus) OVERRIDE {
+  virtual void Init(dbus::Bus* bus) override {
     VLOG(1) << "Creating NfcRecordClient impl";
     DCHECK(bus);
     bus_ = bus;
@@ -106,7 +106,7 @@ class NfcRecordClientImpl : public NfcRecordClient,
 
  private:
   // NfcDeviceClient::Observer override.
-  virtual void DeviceAdded(const dbus::ObjectPath& object_path) OVERRIDE {
+  virtual void DeviceAdded(const dbus::ObjectPath& object_path) override {
     VLOG(1) << "Device added. Creating map for record proxies belonging to "
             << "device: " << object_path.value();
     devices_and_tags_to_object_maps_.CreateObjectMap(
@@ -114,7 +114,7 @@ class NfcRecordClientImpl : public NfcRecordClient,
   }
 
   // NfcDeviceClient::Observer override.
-  virtual void DeviceRemoved(const dbus::ObjectPath& object_path) OVERRIDE {
+  virtual void DeviceRemoved(const dbus::ObjectPath& object_path) override {
     // Neard doesn't send out property changed signals for the records that
     // are removed when the device they belong to is removed. Clean up the
     // object proxies for records that belong to the removed device.
@@ -128,7 +128,7 @@ class NfcRecordClientImpl : public NfcRecordClient,
   // NfcDeviceClient::Observer override.
   virtual void DevicePropertyChanged(
       const dbus::ObjectPath& object_path,
-      const std::string& property_name) OVERRIDE {
+      const std::string& property_name) override {
     // Update the record proxies using records from the device.
     DCHECK(device_client_);
     NfcDeviceClient::Properties* device_properties =
@@ -149,7 +149,7 @@ class NfcRecordClientImpl : public NfcRecordClient,
   }
 
   // NfcTagClient::Observer override.
-  virtual void TagAdded(const dbus::ObjectPath& object_path) OVERRIDE {
+  virtual void TagAdded(const dbus::ObjectPath& object_path) override {
     VLOG(1) << "Tag added. Creating map for record proxies belonging to "
             << "tag: " << object_path.value();
     devices_and_tags_to_object_maps_.CreateObjectMap(
@@ -157,7 +157,7 @@ class NfcRecordClientImpl : public NfcRecordClient,
   }
 
   // NfcTagClient::Observer override.
-  virtual void TagRemoved(const dbus::ObjectPath& object_path) OVERRIDE {
+  virtual void TagRemoved(const dbus::ObjectPath& object_path) override {
     // Neard doesn't send out property changed signals for the records that
     // are removed when the tag they belong to is removed. Clean up the
     // object proxies for records that belong to the removed tag.
@@ -170,7 +170,7 @@ class NfcRecordClientImpl : public NfcRecordClient,
 
   // NfcTagClient::Observer override.
   virtual void TagPropertyChanged(const dbus::ObjectPath& object_path,
-                                  const std::string& property_name) OVERRIDE {
+                                  const std::string& property_name) override {
     // Update the record proxies using records from the tag.
     DCHECK(device_client_);
     NfcTagClient::Properties* tag_properties =
@@ -199,7 +199,7 @@ class NfcRecordClientImpl : public NfcRecordClient,
 
   // nfc_client_helpers::DBusObjectMap::Delegate override.
   virtual NfcPropertySet* CreateProperties(
-      dbus::ObjectProxy* object_proxy) OVERRIDE {
+      dbus::ObjectProxy* object_proxy) override {
     Properties* properties = new Properties(
         object_proxy,
         base::Bind(&NfcRecordClientImpl::OnPropertyChanged,
@@ -213,13 +213,13 @@ class NfcRecordClientImpl : public NfcRecordClient,
   }
 
   // nfc_client_helpers::DBusObjectMap::Delegate override.
-  virtual void ObjectAdded(const dbus::ObjectPath& object_path) OVERRIDE {
+  virtual void ObjectAdded(const dbus::ObjectPath& object_path) override {
     FOR_EACH_OBSERVER(NfcRecordClient::Observer, observers_,
                       RecordAdded(object_path));
   }
 
   // nfc_client_helpers::DBusObjectMap::Delegate override.
-  virtual void ObjectRemoved(const dbus::ObjectPath& object_path) OVERRIDE {
+  virtual void ObjectRemoved(const dbus::ObjectPath& object_path) override {
     FOR_EACH_OBSERVER(NfcRecordClient::Observer, observers_,
                       RecordRemoved(object_path));
   }