replace OVERRIDE and FINAL with override and final in components/

BUG=417463

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

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

5 files changed, 77 insertions, 77 deletions

diff --git a/components/pairing/bluetooth_controller_pairing_controller.h b/components/pairing/bluetooth_controller_pairing_controller.h
index cbc5cd8..e0297e9 100644
--- a/components/pairing/bluetooth_controller_pairing_controller.h
+++ b/components/pairing/bluetooth_controller_pairing_controller.h
@@ -57,55 +57,55 @@ class BluetoothControllerPairingController
 
   // ControllerPairingController:
   virtual void AddObserver(
-      ControllerPairingController::Observer* observer) OVERRIDE;
+      ControllerPairingController::Observer* observer) override;
   virtual void RemoveObserver(
-      ControllerPairingController::Observer* observer) OVERRIDE;
-  virtual Stage GetCurrentStage() OVERRIDE;
-  virtual void StartPairing() OVERRIDE;
-  virtual DeviceIdList GetDiscoveredDevices() OVERRIDE;
-  virtual void ChooseDeviceForPairing(const std::string& device_id) OVERRIDE;
-  virtual void RepeatDiscovery() OVERRIDE;
-  virtual std::string GetConfirmationCode() OVERRIDE;
-  virtual void SetConfirmationCodeIsCorrect(bool correct) OVERRIDE;
+      ControllerPairingController::Observer* observer) override;
+  virtual Stage GetCurrentStage() override;
+  virtual void StartPairing() override;
+  virtual DeviceIdList GetDiscoveredDevices() override;
+  virtual void ChooseDeviceForPairing(const std::string& device_id) override;
+  virtual void RepeatDiscovery() override;
+  virtual std::string GetConfirmationCode() override;
+  virtual void SetConfirmationCodeIsCorrect(bool correct) override;
   virtual void SetHostConfiguration(
       bool accepted_eula,
       const std::string& lang,
       const std::string& timezone,
       bool send_reports,
-      const std::string& keyboard_layout) OVERRIDE;
+      const std::string& keyboard_layout) override;
   virtual void OnAuthenticationDone(const std::string& domain,
-                                    const std::string& auth_token) OVERRIDE;
-  virtual void StartSession() OVERRIDE;
+                                    const std::string& auth_token) override;
+  virtual void StartSession() override;
 
   // ProtoDecoder::Observer:
   virtual void OnHostStatusMessage(
-      const pairing_api::HostStatus& message) OVERRIDE;
+      const pairing_api::HostStatus& message) override;
   virtual void OnConfigureHostMessage(
-      const pairing_api::ConfigureHost& message) OVERRIDE;
+      const pairing_api::ConfigureHost& message) override;
   virtual void OnPairDevicesMessage(
-      const pairing_api::PairDevices& message) OVERRIDE;
+      const pairing_api::PairDevices& message) override;
   virtual void OnCompleteSetupMessage(
-      const pairing_api::CompleteSetup& message) OVERRIDE;
-  virtual void OnErrorMessage(const pairing_api::Error& message) OVERRIDE;
+      const pairing_api::CompleteSetup& message) override;
+  virtual void OnErrorMessage(const pairing_api::Error& message) override;
 
   // BluetoothAdapter::Observer:
   virtual void DeviceAdded(device::BluetoothAdapter* adapter,
-                           device::BluetoothDevice* device) OVERRIDE;
+                           device::BluetoothDevice* device) override;
   virtual void DeviceRemoved(device::BluetoothAdapter* adapter,
-                             device::BluetoothDevice* device) OVERRIDE;
+                             device::BluetoothDevice* device) override;
 
   // device::BluetoothDevice::PairingDelegate:
-  virtual void RequestPinCode(device::BluetoothDevice* device) OVERRIDE;
-  virtual void RequestPasskey(device::BluetoothDevice* device) OVERRIDE;
+  virtual void RequestPinCode(device::BluetoothDevice* device) override;
+  virtual void RequestPasskey(device::BluetoothDevice* device) override;
   virtual void DisplayPinCode(device::BluetoothDevice* device,
-                              const std::string& pincode) OVERRIDE;
+                              const std::string& pincode) override;
   virtual void DisplayPasskey(device::BluetoothDevice* device,
-                              uint32 passkey) OVERRIDE;
+                              uint32 passkey) override;
   virtual void KeysEntered(device::BluetoothDevice* device,
-                           uint32 entered) OVERRIDE;
+                           uint32 entered) override;
   virtual void ConfirmPasskey(device::BluetoothDevice* device,
-                              uint32 passkey) OVERRIDE;
-  virtual void AuthorizePairing(device::BluetoothDevice* device) OVERRIDE;
+                              uint32 passkey) override;
+  virtual void AuthorizePairing(device::BluetoothDevice* device) override;
 
   Stage current_stage_;
   bool got_initial_status_;
diff --git a/components/pairing/bluetooth_host_pairing_controller.h b/components/pairing/bluetooth_host_pairing_controller.h
index 05feab1..edc39fa 100644
--- a/components/pairing/bluetooth_host_pairing_controller.h
+++ b/components/pairing/bluetooth_host_pairing_controller.h
@@ -62,43 +62,43 @@ class BluetoothHostPairingController
                       const std::string& error_message);
 
   // HostPairingController:
-  virtual void AddObserver(Observer* observer) OVERRIDE;
-  virtual void RemoveObserver(Observer* observer) OVERRIDE;
-  virtual Stage GetCurrentStage() OVERRIDE;
-  virtual void StartPairing() OVERRIDE;
-  virtual std::string GetDeviceName() OVERRIDE;
-  virtual std::string GetConfirmationCode() OVERRIDE;
-  virtual std::string GetEnrollmentDomain() OVERRIDE;
-  virtual void OnUpdateStatusChanged(UpdateStatus update_status) OVERRIDE;
-  virtual void SetEnrollmentComplete(bool success) OVERRIDE;
+  virtual void AddObserver(Observer* observer) override;
+  virtual void RemoveObserver(Observer* observer) override;
+  virtual Stage GetCurrentStage() override;
+  virtual void StartPairing() override;
+  virtual std::string GetDeviceName() override;
+  virtual std::string GetConfirmationCode() override;
+  virtual std::string GetEnrollmentDomain() override;
+  virtual void OnUpdateStatusChanged(UpdateStatus update_status) override;
+  virtual void SetEnrollmentComplete(bool success) override;
 
   // ProtoDecoder::Observer:
   virtual void OnHostStatusMessage(
-      const pairing_api::HostStatus& message) OVERRIDE;
+      const pairing_api::HostStatus& message) override;
   virtual void OnConfigureHostMessage(
-      const pairing_api::ConfigureHost& message) OVERRIDE;
+      const pairing_api::ConfigureHost& message) override;
   virtual void OnPairDevicesMessage(
-      const pairing_api::PairDevices& message) OVERRIDE;
+      const pairing_api::PairDevices& message) override;
   virtual void OnCompleteSetupMessage(
-      const pairing_api::CompleteSetup& message) OVERRIDE;
-  virtual void OnErrorMessage(const pairing_api::Error& message) OVERRIDE;
+      const pairing_api::CompleteSetup& message) override;
+  virtual void OnErrorMessage(const pairing_api::Error& message) override;
 
   // BluetoothAdapter::Observer:
   virtual void AdapterPresentChanged(device::BluetoothAdapter* adapter,
-                                     bool present) OVERRIDE;
+                                     bool present) override;
 
   // device::BluetoothDevice::PairingDelegate:
-  virtual void RequestPinCode(device::BluetoothDevice* device) OVERRIDE;
-  virtual void RequestPasskey(device::BluetoothDevice* device) OVERRIDE;
+  virtual void RequestPinCode(device::BluetoothDevice* device) override;
+  virtual void RequestPasskey(device::BluetoothDevice* device) override;
   virtual void DisplayPinCode(device::BluetoothDevice* device,
-                              const std::string& pincode) OVERRIDE;
+                              const std::string& pincode) override;
   virtual void DisplayPasskey(device::BluetoothDevice* device,
-                              uint32 passkey) OVERRIDE;
+                              uint32 passkey) override;
   virtual void KeysEntered(device::BluetoothDevice* device,
-                           uint32 entered) OVERRIDE;
+                           uint32 entered) override;
   virtual void ConfirmPasskey(device::BluetoothDevice* device,
-                              uint32 passkey) OVERRIDE;
-  virtual void AuthorizePairing(device::BluetoothDevice* device) OVERRIDE;
+                              uint32 passkey) override;
+  virtual void AuthorizePairing(device::BluetoothDevice* device) override;
 
   Stage current_stage_;
   std::string device_name_;
diff --git a/components/pairing/fake_controller_pairing_controller.h b/components/pairing/fake_controller_pairing_controller.h
index 99ac3de..edb3666 100644
--- a/components/pairing/fake_controller_pairing_controller.h
+++ b/components/pairing/fake_controller_pairing_controller.h
@@ -64,24 +64,24 @@ class FakeControllerPairingController
   void SetDiscoveryScenario(const DiscoveryScenario& discovery_scenario);
 
   // Overridden from ControllerPairingController:
-  virtual void AddObserver(Observer* observer) OVERRIDE;
-  virtual void RemoveObserver(Observer* observer) OVERRIDE;
-  virtual Stage GetCurrentStage() OVERRIDE;
-  virtual void StartPairing() OVERRIDE;
-  virtual DeviceIdList GetDiscoveredDevices() OVERRIDE;
-  virtual void ChooseDeviceForPairing(const std::string& device_id) OVERRIDE;
-  virtual void RepeatDiscovery() OVERRIDE;
-  virtual std::string GetConfirmationCode() OVERRIDE;
-  virtual void SetConfirmationCodeIsCorrect(bool correct) OVERRIDE;
+  virtual void AddObserver(Observer* observer) override;
+  virtual void RemoveObserver(Observer* observer) override;
+  virtual Stage GetCurrentStage() override;
+  virtual void StartPairing() override;
+  virtual DeviceIdList GetDiscoveredDevices() override;
+  virtual void ChooseDeviceForPairing(const std::string& device_id) override;
+  virtual void RepeatDiscovery() override;
+  virtual std::string GetConfirmationCode() override;
+  virtual void SetConfirmationCodeIsCorrect(bool correct) override;
   virtual void SetHostConfiguration(
       bool accepted_eula,
       const std::string& lang,
       const std::string& timezone,
       bool send_reports,
-      const std::string& keyboard_layout) OVERRIDE;
+      const std::string& keyboard_layout) override;
   virtual void OnAuthenticationDone(const std::string& domain,
-                                    const std::string& auth_token) OVERRIDE;
-  virtual void StartSession() OVERRIDE;
+                                    const std::string& auth_token) override;
+  virtual void StartSession() override;
 
  private:
   void ChangeStage(Stage new_stage);
@@ -91,8 +91,8 @@ class FakeControllerPairingController
   void DeviceLost(const std::string& device_id);
 
   // Overridden from ui::ControllerPairingController::Observer:
-  virtual void PairingStageChanged(Stage new_stage) OVERRIDE;
-  virtual void DiscoveredDevicesListChanged() OVERRIDE;
+  virtual void PairingStageChanged(Stage new_stage) override;
+  virtual void DiscoveredDevicesListChanged() override;
 
   ObserverList<ControllerPairingController::Observer> observers_;
   Stage current_stage_;
diff --git a/components/pairing/fake_host_pairing_controller.h b/components/pairing/fake_host_pairing_controller.h
index f665aa6..138963a 100644
--- a/components/pairing/fake_host_pairing_controller.h
+++ b/components/pairing/fake_host_pairing_controller.h
@@ -34,28 +34,28 @@ class FakeHostPairingController
   void ApplyConfig(const std::string& config);
 
   // Overridden from HostPairingFlow:
-  virtual void AddObserver(Observer* observer) OVERRIDE;
-  virtual void RemoveObserver(Observer* observer) OVERRIDE;
-  virtual Stage GetCurrentStage() OVERRIDE;
-  virtual void StartPairing() OVERRIDE;
-  virtual std::string GetDeviceName() OVERRIDE;
-  virtual std::string GetConfirmationCode() OVERRIDE;
-  virtual std::string GetEnrollmentDomain() OVERRIDE;
-  virtual void OnUpdateStatusChanged(UpdateStatus update_status) OVERRIDE;
-  virtual void SetEnrollmentComplete(bool success) OVERRIDE;
+  virtual void AddObserver(Observer* observer) override;
+  virtual void RemoveObserver(Observer* observer) override;
+  virtual Stage GetCurrentStage() override;
+  virtual void StartPairing() override;
+  virtual std::string GetDeviceName() override;
+  virtual std::string GetConfirmationCode() override;
+  virtual std::string GetEnrollmentDomain() override;
+  virtual void OnUpdateStatusChanged(UpdateStatus update_status) override;
+  virtual void SetEnrollmentComplete(bool success) override;
 
  private:
   void ChangeStage(Stage new_stage);
   void ChangeStageLater(Stage new_stage);
 
   // HostPairingFlow::Observer:
-  virtual void PairingStageChanged(Stage new_stage) OVERRIDE;
+  virtual void PairingStageChanged(Stage new_stage) override;
   virtual void ConfigureHost(bool accepted_eula,
                              const std::string& lang,
                              const std::string& timezone,
                              bool send_reports,
-                             const std::string& keyboard_layout) OVERRIDE;
-  virtual void EnrollHost(const std::string& auth_token) OVERRIDE;
+                             const std::string& keyboard_layout) override;
+  virtual void EnrollHost(const std::string& auth_token) override;
 
   ObserverList<Observer> observers_;
   Stage current_stage_;
diff --git a/components/pairing/shark_connection_listener.h b/components/pairing/shark_connection_listener.h
index e2e786b..e2f9b06 100644
--- a/components/pairing/shark_connection_listener.h
+++ b/components/pairing/shark_connection_listener.h
@@ -29,13 +29,13 @@ class SharkConnectionListener : public HostPairingController::Observer {
   typedef HostPairingController::Stage Stage;
 
   // HostPairingController::Observer overrides:
-  virtual void PairingStageChanged(Stage new_stage) OVERRIDE;
+  virtual void PairingStageChanged(Stage new_stage) override;
   virtual void ConfigureHost(bool accepted_eula,
                              const std::string& lang,
                              const std::string& timezone,
                              bool send_reports,
-                             const std::string& keyboard_layout) OVERRIDE;
-  virtual void EnrollHost(const std::string& auth_token) OVERRIDE;
+                             const std::string& keyboard_layout) override;
+  virtual void EnrollHost(const std::string& auth_token) override;
 
   OnConnectedCallback callback_;
   scoped_ptr<HostPairingController> controller_;