replace OVERRIDE and FINAL with override and final in chromeos/

chromeos/dbus/shill_device_client.cc

 // Copyright (c) 2012 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/shill_device_client.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "base/values.h"
@@ skipping 26 matching lines @@
       CHECK(iter->second) << "NULL Helper found in helper list.";
       delete iter->second;
     }
     helpers_.clear();
   }
 
   ///////////////////////////////////////
   // ShillDeviceClient overrides.
   virtual void AddPropertyChangedObserver(
       const dbus::ObjectPath& device_path,
-      ShillPropertyChangedObserver* observer) OVERRIDE {
+      ShillPropertyChangedObserver* observer) override {
     GetHelper(device_path)->AddPropertyChangedObserver(observer);
   }
 
   virtual void RemovePropertyChangedObserver(
       const dbus::ObjectPath& device_path,
-      ShillPropertyChangedObserver* observer) OVERRIDE {
+      ShillPropertyChangedObserver* observer) override {
     GetHelper(device_path)->RemovePropertyChangedObserver(observer);
   }
 
   virtual void GetProperties(const dbus::ObjectPath& device_path,
-                             const DictionaryValueCallback& callback) OVERRIDE {
+                             const DictionaryValueCallback& callback) override {
     dbus::MethodCall method_call(shill::kFlimflamDeviceInterface,
                                  shill::kGetPropertiesFunction);
     GetHelper(device_path)->CallDictionaryValueMethod(&method_call, callback);
   }
 
   virtual void ProposeScan(const dbus::ObjectPath& device_path,
-                           const VoidDBusMethodCallback& callback) OVERRIDE {
+                           const VoidDBusMethodCallback& callback) override {
     dbus::MethodCall method_call(shill::kFlimflamDeviceInterface,
                                  shill::kProposeScanFunction);
     GetHelper(device_path)->CallVoidMethod(&method_call, callback);
   }
 
   virtual void SetProperty(const dbus::ObjectPath& device_path,
                            const std::string& name,
                            const base::Value& value,
                            const base::Closure& callback,
-                           const ErrorCallback& error_callback) OVERRIDE {
+                           const ErrorCallback& error_callback) override {
     dbus::MethodCall method_call(shill::kFlimflamDeviceInterface,
                                  shill::kSetPropertyFunction);
     dbus::MessageWriter writer(&method_call);
     writer.AppendString(name);
     ShillClientHelper::AppendValueDataAsVariant(&writer, value);
     GetHelper(device_path)->CallVoidMethodWithErrorCallback(&method_call,
                                                             callback,
                                                             error_callback);
   }
 
   virtual void ClearProperty(const dbus::ObjectPath& device_path,
                              const std::string& name,
-                             const VoidDBusMethodCallback& callback) OVERRIDE {
+                             const VoidDBusMethodCallback& callback) override {
     dbus::MethodCall method_call(shill::kFlimflamDeviceInterface,
                                  shill::kClearPropertyFunction);
     dbus::MessageWriter writer(&method_call);
     writer.AppendString(name);
     GetHelper(device_path)->CallVoidMethod(&method_call, callback);
   }
 
   virtual void AddIPConfig(
       const dbus::ObjectPath& device_path,
       const std::string& method,
-      const ObjectPathDBusMethodCallback& callback) OVERRIDE {
+      const ObjectPathDBusMethodCallback& callback) override {
     dbus::MethodCall method_call(shill::kFlimflamDeviceInterface,
                                  shill::kAddIPConfigFunction);
     dbus::MessageWriter writer(&method_call);
     writer.AppendString(method);
     GetHelper(device_path)->CallObjectPathMethod(&method_call, callback);
   }
 
   virtual void RequirePin(const dbus::ObjectPath& device_path,
                           const std::string& pin,
                           bool require,
                           const base::Closure& callback,
-                          const ErrorCallback& error_callback) OVERRIDE {
+                          const ErrorCallback& error_callback) override {
     dbus::MethodCall method_call(shill::kFlimflamDeviceInterface,
                                  shill::kRequirePinFunction);
     dbus::MessageWriter writer(&method_call);
     writer.AppendString(pin);
     writer.AppendBool(require);
     GetHelper(device_path)->CallVoidMethodWithErrorCallback(
         &method_call, callback, error_callback);
   }
 
   virtual void EnterPin(const dbus::ObjectPath& device_path,
                         const std::string& pin,
                         const base::Closure& callback,
-                        const ErrorCallback& error_callback) OVERRIDE {
+                        const ErrorCallback& error_callback) override {
     dbus::MethodCall method_call(shill::kFlimflamDeviceInterface,
                                  shill::kEnterPinFunction);
     dbus::MessageWriter writer(&method_call);
     writer.AppendString(pin);
     GetHelper(device_path)->CallVoidMethodWithErrorCallback(
         &method_call, callback, error_callback);
   }
 
   virtual void UnblockPin(const dbus::ObjectPath& device_path,
                           const std::string& puk,
                           const std::string& pin,
                           const base::Closure& callback,
-                          const ErrorCallback& error_callback) OVERRIDE {
+                          const ErrorCallback& error_callback) override {
     dbus::MethodCall method_call(shill::kFlimflamDeviceInterface,
                                  shill::kUnblockPinFunction);
     dbus::MessageWriter writer(&method_call);
     writer.AppendString(puk);
     writer.AppendString(pin);
     GetHelper(device_path)->CallVoidMethodWithErrorCallback(
         &method_call, callback, error_callback);
   }
 
   virtual void ChangePin(const dbus::ObjectPath& device_path,
                          const std::string& old_pin,
                          const std::string& new_pin,
                          const base::Closure& callback,
-                         const ErrorCallback& error_callback) OVERRIDE {
+                         const ErrorCallback& error_callback) override {
     dbus::MethodCall method_call(shill::kFlimflamDeviceInterface,
                                  shill::kChangePinFunction);
     dbus::MessageWriter writer(&method_call);
     writer.AppendString(old_pin);
     writer.AppendString(new_pin);
     GetHelper(device_path)->CallVoidMethodWithErrorCallback(
         &method_call, callback, error_callback);
   }
 
   virtual void Register(const dbus::ObjectPath& device_path,
                         const std::string& network_id,
                         const base::Closure& callback,
-                        const ErrorCallback& error_callback) OVERRIDE {
+                        const ErrorCallback& error_callback) override {
     dbus::MethodCall method_call(shill::kFlimflamDeviceInterface,
                                  shill::kRegisterFunction);
     dbus::MessageWriter writer(&method_call);
     writer.AppendString(network_id);
     GetHelper(device_path)->CallVoidMethodWithErrorCallback(
         &method_call, callback, error_callback);
   }
 
   virtual void SetCarrier(const dbus::ObjectPath& device_path,
                           const std::string& carrier,
                           const base::Closure& callback,
-                          const ErrorCallback& error_callback) OVERRIDE {
+                          const ErrorCallback& error_callback) override {
     dbus::MethodCall method_call(shill::kFlimflamDeviceInterface,
                                  shill::kSetCarrierFunction);
     dbus::MessageWriter writer(&method_call);
     writer.AppendString(carrier);
     GetHelper(device_path)->CallVoidMethodWithErrorCallback(
         &method_call, callback, error_callback);
   }
 
   virtual void Reset(const dbus::ObjectPath& device_path,
                      const base::Closure& callback,
-                     const ErrorCallback& error_callback) OVERRIDE {
+                     const ErrorCallback& error_callback) override {
     dbus::MethodCall method_call(shill::kFlimflamDeviceInterface,
                                  shill::kResetFunction);
     GetHelper(device_path)->CallVoidMethodWithErrorCallback(
         &method_call, callback, error_callback);
   }
 
   virtual void PerformTDLSOperation(
       const dbus::ObjectPath& device_path,
       const std::string& operation,
       const std::string& peer,
       const StringCallback& callback,
-      const ErrorCallback& error_callback) OVERRIDE {
+      const ErrorCallback& error_callback) override {
     dbus::MethodCall method_call(shill::kFlimflamDeviceInterface,
                                  shill::kPerformTDLSOperationFunction);
     dbus::MessageWriter writer(&method_call);
     writer.AppendString(operation);
     writer.AppendString(peer);
     GetHelper(device_path)->CallStringMethodWithErrorCallback(
         &method_call, callback, error_callback);
   }
 
-  virtual TestInterface* GetTestInterface() OVERRIDE {
+  virtual TestInterface* GetTestInterface() override {
     return NULL;
   }
 
  protected:
-  virtual void Init(dbus::Bus* bus) OVERRIDE {
+  virtual void Init(dbus::Bus* bus) override {
     bus_ = bus;
   }
 
  private:
   typedef std::map<std::string, ShillClientHelper*> HelperMap;
 
   // Returns the corresponding ShillClientHelper for the profile.
   ShillClientHelper* GetHelper(const dbus::ObjectPath& device_path) {
     HelperMap::iterator it = helpers_.find(device_path.value());
     if (it != helpers_.end()) {
@@ skipping 22 matching lines @@
 ShillDeviceClient::ShillDeviceClient() {}
 
 ShillDeviceClient::~ShillDeviceClient() {}
 
 // static
 ShillDeviceClient* ShillDeviceClient::Create() {
   return new ShillDeviceClientImpl();
 }
 
 }  // namespace chromeos