replace OVERRIDE and FINAL with override and final in chromeos/

chromeos/dbus/bluetooth_gatt_characteristic_client.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/dbus/bluetooth_gatt_characteristic_client.h"
 
 #include "base/bind.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "dbus/bus.h"
@@ skipping 36 matching lines @@
         weak_ptr_factory_(this) {
   }
 
   virtual ~BluetoothGattCharacteristicClientImpl() {
     object_manager_->UnregisterInterface(
         bluetooth_gatt_characteristic::kBluetoothGattCharacteristicInterface);
   }
 
   // BluetoothGattCharacteristicClient override.
   virtual void AddObserver(
-      BluetoothGattCharacteristicClient::Observer* observer) OVERRIDE {
+      BluetoothGattCharacteristicClient::Observer* observer) override {
     DCHECK(observer);
     observers_.AddObserver(observer);
   }
 
   // BluetoothGattCharacteristicClient override.
   virtual void RemoveObserver(
-      BluetoothGattCharacteristicClient::Observer* observer) OVERRIDE {
+      BluetoothGattCharacteristicClient::Observer* observer) override {
     DCHECK(observer);
     observers_.RemoveObserver(observer);
   }
 
   // BluetoothGattCharacteristicClient override.
-  virtual std::vector<dbus::ObjectPath> GetCharacteristics() OVERRIDE {
+  virtual std::vector<dbus::ObjectPath> GetCharacteristics() override {
     DCHECK(object_manager_);
     return object_manager_->GetObjectsWithInterface(
         bluetooth_gatt_characteristic::kBluetoothGattCharacteristicInterface);
   }
 
   // BluetoothGattCharacteristicClient override.
   virtual Properties* GetProperties(
-      const dbus::ObjectPath& object_path) OVERRIDE {
+      const dbus::ObjectPath& object_path) override {
     DCHECK(object_manager_);
     return static_cast<Properties*>(
         object_manager_->GetProperties(
             object_path,
             bluetooth_gatt_characteristic::
                 kBluetoothGattCharacteristicInterface));
   }
 
   // BluetoothGattCharacteristicClient override.
   virtual void ReadValue(const dbus::ObjectPath& object_path,
                          const ValueCallback& callback,
-                         const ErrorCallback& error_callback) OVERRIDE {
+                         const ErrorCallback& error_callback) override {
     dbus::ObjectProxy* object_proxy =
         object_manager_->GetObjectProxy(object_path);
     if (!object_proxy) {
       error_callback.Run(kUnknownCharacteristicError, "");
       return;
     }
 
     dbus::MethodCall method_call(
         bluetooth_gatt_characteristic::kBluetoothGattCharacteristicInterface,
         bluetooth_gatt_characteristic::kReadValue);
 
     object_proxy->CallMethodWithErrorCallback(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&BluetoothGattCharacteristicClientImpl::OnValueSuccess,
                    weak_ptr_factory_.GetWeakPtr(),
                    callback),
         base::Bind(&BluetoothGattCharacteristicClientImpl::OnError,
                    weak_ptr_factory_.GetWeakPtr(),
                    error_callback));
   }
 
   // BluetoothGattCharacteristicClient override.
   virtual void WriteValue(const dbus::ObjectPath& object_path,
                           const std::vector<uint8>& value,
                           const base::Closure& callback,
-                          const ErrorCallback& error_callback) OVERRIDE {
+                          const ErrorCallback& error_callback) override {
     dbus::ObjectProxy* object_proxy =
         object_manager_->GetObjectProxy(object_path);
     if (!object_proxy) {
       error_callback.Run(kUnknownCharacteristicError, "");
       return;
     }
 
     dbus::MethodCall method_call(
         bluetooth_gatt_characteristic::kBluetoothGattCharacteristicInterface,
         bluetooth_gatt_characteristic::kWriteValue);
     dbus::MessageWriter writer(&method_call);
     writer.AppendArrayOfBytes(value.data(), value.size());
 
     object_proxy->CallMethodWithErrorCallback(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&BluetoothGattCharacteristicClientImpl::OnSuccess,
                    weak_ptr_factory_.GetWeakPtr(),
                    callback),
         base::Bind(&BluetoothGattCharacteristicClientImpl::OnError,
                    weak_ptr_factory_.GetWeakPtr(),
                    error_callback));
   }
 
   // BluetoothGattCharacteristicClient override.
   virtual void StartNotify(const dbus::ObjectPath& object_path,
                            const base::Closure& callback,
-                           const ErrorCallback& error_callback) OVERRIDE {
+                           const ErrorCallback& error_callback) override {
     dbus::ObjectProxy* object_proxy =
         object_manager_->GetObjectProxy(object_path);
     if (!object_proxy) {
       error_callback.Run(kUnknownCharacteristicError, "");
       return;
     }
 
     dbus::MethodCall method_call(
         bluetooth_gatt_characteristic::kBluetoothGattCharacteristicInterface,
         bluetooth_gatt_characteristic::kStartNotify);
 
     object_proxy->CallMethodWithErrorCallback(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&BluetoothGattCharacteristicClientImpl::OnSuccess,
                    weak_ptr_factory_.GetWeakPtr(),
                    callback),
         base::Bind(&BluetoothGattCharacteristicClientImpl::OnError,
                    weak_ptr_factory_.GetWeakPtr(),
                    error_callback));
   }
 
   // BluetoothGattCharacteristicClient override.
   virtual void StopNotify(const dbus::ObjectPath& object_path,
                           const base::Closure& callback,
-                          const ErrorCallback& error_callback) OVERRIDE {
+                          const ErrorCallback& error_callback) override {
     dbus::ObjectProxy* object_proxy =
         object_manager_->GetObjectProxy(object_path);
     if (!object_proxy) {
       error_callback.Run(kUnknownCharacteristicError, "");
       return;
     }
 
     dbus::MethodCall method_call(
         bluetooth_gatt_characteristic::kBluetoothGattCharacteristicInterface,
         bluetooth_gatt_characteristic::kStopNotify);
 
     object_proxy->CallMethodWithErrorCallback(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&BluetoothGattCharacteristicClientImpl::OnSuccess,
                    weak_ptr_factory_.GetWeakPtr(),
                    callback),
         base::Bind(&BluetoothGattCharacteristicClientImpl::OnError,
                    weak_ptr_factory_.GetWeakPtr(),
                    error_callback));
   }
 
   // dbus::ObjectManager::Interface override.
   virtual dbus::PropertySet* CreateProperties(
       dbus::ObjectProxy *object_proxy,
       const dbus::ObjectPath& object_path,
-      const std::string& interface_name) OVERRIDE {
+      const std::string& interface_name) override {
     Properties* properties = new Properties(
         object_proxy,
         interface_name,
         base::Bind(&BluetoothGattCharacteristicClientImpl::OnPropertyChanged,
                    weak_ptr_factory_.GetWeakPtr(),
                    object_path));
     return static_cast<dbus::PropertySet*>(properties);
   }
 
   // dbus::ObjectManager::Interface override.
   virtual void ObjectAdded(const dbus::ObjectPath& object_path,
-                           const std::string& interface_name) OVERRIDE {
+                           const std::string& interface_name) override {
     VLOG(2) << "Remote GATT characteristic added: " << object_path.value();
     FOR_EACH_OBSERVER(BluetoothGattCharacteristicClient::Observer, observers_,
                       GattCharacteristicAdded(object_path));
 
     // Connect the "ValueUpdated" signal.
     dbus::ObjectProxy* object_proxy =
         object_manager_->GetObjectProxy(object_path);
     DCHECK(object_proxy);
 
     object_proxy->ConnectToSignal(
         bluetooth_gatt_characteristic::kBluetoothGattCharacteristicInterface,
         bluetooth_gatt_characteristic::kValueUpdatedSignal,
         base::Bind(&BluetoothGattCharacteristicClientImpl::ValueUpdatedReceived,
                    weak_ptr_factory_.GetWeakPtr(),
                    object_path),
         base::Bind(
             &BluetoothGattCharacteristicClientImpl::ValueUpdatedConnected,
             weak_ptr_factory_.GetWeakPtr()));
   }
 
   // dbus::ObjectManager::Interface override.
   virtual void ObjectRemoved(const dbus::ObjectPath& object_path,
-                             const std::string& interface_name) OVERRIDE {
+                             const std::string& interface_name) override {
     VLOG(2) << "Remote GATT characteristic removed: " << object_path.value();
     FOR_EACH_OBSERVER(BluetoothGattCharacteristicClient::Observer, observers_,
                       GattCharacteristicRemoved(object_path));
   }
 
  protected:
   // chromeos::DBusClient override.
-  virtual void Init(dbus::Bus* bus) OVERRIDE {
+  virtual void Init(dbus::Bus* bus) override {
     object_manager_ = bus->GetObjectManager(
         bluetooth_object_manager::kBluetoothObjectManagerServiceName,
         dbus::ObjectPath(
             bluetooth_object_manager::kBluetoothObjectManagerServicePath));
     object_manager_->RegisterInterface(
         bluetooth_gatt_characteristic::kBluetoothGattCharacteristicInterface,
         this);
   }
 
  private:
@@ skipping 101 matching lines @@
 
 BluetoothGattCharacteristicClient::~BluetoothGattCharacteristicClient() {
 }
 
 // static
 BluetoothGattCharacteristicClient* BluetoothGattCharacteristicClient::Create() {
   return new BluetoothGattCharacteristicClientImpl();
 }
 
 }  // namespace chromeos