replace OVERRIDE and FINAL with override and final in device/

BUG=417463

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

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

24 files changed, 305 insertions, 305 deletions

diff --git a/device/bluetooth/bluetooth_adapter_chromeos.h b/device/bluetooth/bluetooth_adapter_chromeos.h
index 7e1e50e..bd9ec9e 100644
--- a/device/bluetooth/bluetooth_adapter_chromeos.h
+++ b/device/bluetooth/bluetooth_adapter_chromeos.h
@@ -44,37 +44,37 @@ class BluetoothAdapterChromeOS
 
   // BluetoothAdapter:
   virtual void AddObserver(
-      device::BluetoothAdapter::Observer* observer) OVERRIDE;
+      device::BluetoothAdapter::Observer* observer) override;
   virtual void RemoveObserver(
-      device::BluetoothAdapter::Observer* observer) OVERRIDE;
-  virtual std::string GetAddress() const OVERRIDE;
-  virtual std::string GetName() const OVERRIDE;
+      device::BluetoothAdapter::Observer* observer) override;
+  virtual std::string GetAddress() const override;
+  virtual std::string GetName() const override;
   virtual void SetName(const std::string& name,
                        const base::Closure& callback,
-                       const ErrorCallback& error_callback) OVERRIDE;
-  virtual bool IsInitialized() const OVERRIDE;
-  virtual bool IsPresent() const OVERRIDE;
-  virtual bool IsPowered() const OVERRIDE;
+                       const ErrorCallback& error_callback) override;
+  virtual bool IsInitialized() const override;
+  virtual bool IsPresent() const override;
+  virtual bool IsPowered() const override;
   virtual void SetPowered(
       bool powered,
       const base::Closure& callback,
-      const ErrorCallback& error_callback) OVERRIDE;
-  virtual bool IsDiscoverable() const OVERRIDE;
+      const ErrorCallback& error_callback) override;
+  virtual bool IsDiscoverable() const override;
   virtual void SetDiscoverable(
       bool discoverable,
       const base::Closure& callback,
-      const ErrorCallback& error_callback) OVERRIDE;
-  virtual bool IsDiscovering() const OVERRIDE;
+      const ErrorCallback& error_callback) override;
+  virtual bool IsDiscovering() const override;
   virtual void CreateRfcommService(
       const device::BluetoothUUID& uuid,
       const ServiceOptions& options,
       const CreateServiceCallback& callback,
-      const CreateServiceErrorCallback& error_callback) OVERRIDE;
+      const CreateServiceErrorCallback& error_callback) override;
   virtual void CreateL2capService(
       const device::BluetoothUUID& uuid,
       const ServiceOptions& options,
       const CreateServiceCallback& callback,
-      const CreateServiceErrorCallback& error_callback) OVERRIDE;
+      const CreateServiceErrorCallback& error_callback) override;
 
   // Locates the device object by object path (the devices map and
   // BluetoothDevice methods are by address).
@@ -112,7 +112,7 @@ class BluetoothAdapterChromeOS
  protected:
   // BluetoothAdapter:
   virtual void RemovePairingDelegateInternal(
-      device::BluetoothDevice::PairingDelegate* pairing_delegate) OVERRIDE;
+      device::BluetoothDevice::PairingDelegate* pairing_delegate) override;
 
  private:
   friend class BluetoothChromeOSTest;
@@ -127,43 +127,43 @@ class BluetoothAdapterChromeOS
   virtual ~BluetoothAdapterChromeOS();
 
   // BluetoothAdapterClient::Observer override.
-  virtual void AdapterAdded(const dbus::ObjectPath& object_path) OVERRIDE;
-  virtual void AdapterRemoved(const dbus::ObjectPath& object_path) OVERRIDE;
+  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;
+      const std::string& property_name) override;
 
   // BluetoothDeviceClient::Observer override.
-  virtual void DeviceAdded(const dbus::ObjectPath& object_path) OVERRIDE;
-  virtual void DeviceRemoved(const dbus::ObjectPath& object_path) OVERRIDE;
+  virtual void DeviceAdded(const dbus::ObjectPath& object_path) override;
+  virtual void DeviceRemoved(const dbus::ObjectPath& object_path) override;
   virtual void DevicePropertyChanged(const dbus::ObjectPath& object_path,
-                                     const std::string& property_name) OVERRIDE;
+                                     const std::string& property_name) override;
 
   // BluetoothInputClient::Observer override.
   virtual void InputPropertyChanged(const dbus::ObjectPath& object_path,
-                                    const std::string& property_name) OVERRIDE;
+                                    const std::string& property_name) override;
 
   // BluetoothAgentServiceProvider::Delegate override.
-  virtual void Released() OVERRIDE;
+  virtual void Released() override;
   virtual void RequestPinCode(const dbus::ObjectPath& device_path,
-                              const PinCodeCallback& callback) OVERRIDE;
+                              const PinCodeCallback& callback) override;
   virtual void DisplayPinCode(const dbus::ObjectPath& device_path,
-                              const std::string& pincode) OVERRIDE;
+                              const std::string& pincode) override;
   virtual void RequestPasskey(const dbus::ObjectPath& device_path,
-                              const PasskeyCallback& callback) OVERRIDE;
+                              const PasskeyCallback& callback) override;
   virtual void DisplayPasskey(const dbus::ObjectPath& device_path,
-                              uint32 passkey, uint16 entered) OVERRIDE;
+                              uint32 passkey, uint16 entered) override;
   virtual void RequestConfirmation(const dbus::ObjectPath& device_path,
                                    uint32 passkey,
                                    const ConfirmationCallback& callback)
-      OVERRIDE;
+      override;
   virtual void RequestAuthorization(const dbus::ObjectPath& device_path,
                                     const ConfirmationCallback& callback)
-      OVERRIDE;
+      override;
   virtual void AuthorizeService(const dbus::ObjectPath& device_path,
                                 const std::string& uuid,
-                                const ConfirmationCallback& callback) OVERRIDE;
-  virtual void Cancel() OVERRIDE;
+                                const ConfirmationCallback& callback) override;
+  virtual void Cancel() override;
 
   // Called by dbus:: on completion of the D-Bus method call to register the
   // pairing agent.
@@ -214,10 +214,10 @@ class BluetoothAdapterChromeOS
   // BluetoothAdapter:
   virtual void AddDiscoverySession(
       const base::Closure& callback,
-      const ErrorCallback& error_callback) OVERRIDE;
+      const ErrorCallback& error_callback) override;
   virtual void RemoveDiscoverySession(
       const base::Closure& callback,
-      const ErrorCallback& error_callback) OVERRIDE;
+      const ErrorCallback& error_callback) override;
 
   // Called by dbus:: on completion of the D-Bus method call to start discovery.
   void OnStartDiscovery(const base::Closure& callback);
diff --git a/device/bluetooth/bluetooth_adapter_mac.h b/device/bluetooth/bluetooth_adapter_mac.h
index a460d1d..7f1cc51 100644
--- a/device/bluetooth/bluetooth_adapter_mac.h
+++ b/device/bluetooth/bluetooth_adapter_mac.h
@@ -38,40 +38,40 @@ class BluetoothAdapterMac : public BluetoothAdapter,
   static base::WeakPtr<BluetoothAdapter> CreateAdapter();
 
   // BluetoothAdapter:
-  virtual void AddObserver(BluetoothAdapter::Observer* observer) OVERRIDE;
-  virtual void RemoveObserver(BluetoothAdapter::Observer* observer) OVERRIDE;
-  virtual std::string GetAddress() const OVERRIDE;
-  virtual std::string GetName() const OVERRIDE;
+  virtual void AddObserver(BluetoothAdapter::Observer* observer) override;
+  virtual void RemoveObserver(BluetoothAdapter::Observer* observer) override;
+  virtual std::string GetAddress() const override;
+  virtual std::string GetName() const override;
   virtual void SetName(const std::string& name,
                        const base::Closure& callback,
-                       const ErrorCallback& error_callback) OVERRIDE;
-  virtual bool IsInitialized() const OVERRIDE;
-  virtual bool IsPresent() const OVERRIDE;
-  virtual bool IsPowered() const OVERRIDE;
+                       const ErrorCallback& error_callback) override;
+  virtual bool IsInitialized() const override;
+  virtual bool IsPresent() const override;
+  virtual bool IsPowered() const override;
   virtual void SetPowered(
       bool powered,
       const base::Closure& callback,
-      const ErrorCallback& error_callback) OVERRIDE;
-  virtual bool IsDiscoverable() const OVERRIDE;
+      const ErrorCallback& error_callback) override;
+  virtual bool IsDiscoverable() const override;
   virtual void SetDiscoverable(
       bool discoverable,
       const base::Closure& callback,
-      const ErrorCallback& error_callback) OVERRIDE;
-  virtual bool IsDiscovering() const OVERRIDE;
+      const ErrorCallback& error_callback) override;
+  virtual bool IsDiscovering() const override;
   virtual void CreateRfcommService(
       const BluetoothUUID& uuid,
       const ServiceOptions& options,
       const CreateServiceCallback& callback,
-      const CreateServiceErrorCallback& error_callback) OVERRIDE;
+      const CreateServiceErrorCallback& error_callback) override;
   virtual void CreateL2capService(
       const BluetoothUUID& uuid,
       const ServiceOptions& options,
       const CreateServiceCallback& callback,
-      const CreateServiceErrorCallback& error_callback) OVERRIDE;
+      const CreateServiceErrorCallback& error_callback) override;
 
   // BluetoothDiscoveryManagerMac::Observer overrides
-  virtual void DeviceFound(IOBluetoothDevice* device) OVERRIDE;
-  virtual void DiscoveryStopped(bool unexpected) OVERRIDE;
+  virtual void DeviceFound(IOBluetoothDevice* device) override;
+  virtual void DiscoveryStopped(bool unexpected) override;
 
   // Registers that a new |device| has connected to the local host.
   void DeviceConnected(IOBluetoothDevice* device);
@@ -79,7 +79,7 @@ class BluetoothAdapterMac : public BluetoothAdapter,
  protected:
   // BluetoothAdapter:
   virtual void RemovePairingDelegateInternal(
-      device::BluetoothDevice::PairingDelegate* pairing_delegate) OVERRIDE;
+      device::BluetoothDevice::PairingDelegate* pairing_delegate) override;
 
  private:
   friend class BluetoothAdapterMacTest;
@@ -90,10 +90,10 @@ class BluetoothAdapterMac : public BluetoothAdapter,
   // BluetoothAdapter:
   virtual void AddDiscoverySession(
       const base::Closure& callback,
-      const ErrorCallback& error_callback) OVERRIDE;
+      const ErrorCallback& error_callback) override;
   virtual void RemoveDiscoverySession(
       const base::Closure& callback,
-      const ErrorCallback& error_callback) OVERRIDE;
+      const ErrorCallback& error_callback) override;
 
   void Init();
   void InitForTest(scoped_refptr<base::SequencedTaskRunner> ui_task_runner);
diff --git a/device/bluetooth/bluetooth_adapter_unittest.cc b/device/bluetooth/bluetooth_adapter_unittest.cc
index 06fd5fe..88d94c9 100644
--- a/device/bluetooth/bluetooth_adapter_unittest.cc
+++ b/device/bluetooth/bluetooth_adapter_unittest.cc
@@ -17,75 +17,75 @@ class TestBluetoothAdapter : public BluetoothAdapter {
   TestBluetoothAdapter() {
   }
 
-  virtual void AddObserver(BluetoothAdapter::Observer* observer) OVERRIDE {
+  virtual void AddObserver(BluetoothAdapter::Observer* observer) override {
   }
 
-  virtual void RemoveObserver(BluetoothAdapter::Observer* observer) OVERRIDE {
+  virtual void RemoveObserver(BluetoothAdapter::Observer* observer) override {
 
   }
 
-  virtual std::string GetAddress() const OVERRIDE {
+  virtual std::string GetAddress() const override {
     return "";
   }
 
-  virtual std::string GetName() const OVERRIDE {
+  virtual std::string GetName() const override {
     return "";
   }
 
   virtual void SetName(const std::string& name,
                        const base::Closure& callback,
-                       const ErrorCallback& error_callback) OVERRIDE {
+                       const ErrorCallback& error_callback) override {
   }
 
-  virtual bool IsInitialized() const OVERRIDE {
+  virtual bool IsInitialized() const override {
     return false;
   }
 
-  virtual bool IsPresent() const OVERRIDE {
+  virtual bool IsPresent() const override {
     return false;
   }
 
-  virtual bool IsPowered() const OVERRIDE {
+  virtual bool IsPowered() const override {
     return false;
   }
 
   virtual void SetPowered(
       bool powered,
       const base::Closure& callback,
-      const ErrorCallback& error_callback) OVERRIDE {
+      const ErrorCallback& error_callback) override {
   }
 
-  virtual bool IsDiscoverable() const OVERRIDE {
+  virtual bool IsDiscoverable() const override {
     return false;
   }
 
   virtual void SetDiscoverable(
       bool discoverable,
       const base::Closure& callback,
-      const ErrorCallback& error_callback) OVERRIDE {
+      const ErrorCallback& error_callback) override {
   }
 
-  virtual bool IsDiscovering() const OVERRIDE {
+  virtual bool IsDiscovering() const override {
     return false;
   }
 
   virtual void StartDiscoverySession(
       const DiscoverySessionCallback& callback,
-      const ErrorCallback& error_callback) OVERRIDE {
+      const ErrorCallback& error_callback) override {
   }
 
   virtual void CreateRfcommService(
       const BluetoothUUID& uuid,
       const ServiceOptions& options,
       const CreateServiceCallback& callback,
-      const CreateServiceErrorCallback& error_callback) OVERRIDE {
+      const CreateServiceErrorCallback& error_callback) override {
   }
 
   virtual void CreateL2capService(
       const BluetoothUUID& uuid,
       const ServiceOptions& options,
       const CreateServiceCallback& callback,
-      const CreateServiceErrorCallback& error_callback) OVERRIDE {
+      const CreateServiceErrorCallback& error_callback) override {
   }
 
  protected:
@@ -93,32 +93,32 @@ class TestBluetoothAdapter : public BluetoothAdapter {
 
   virtual void AddDiscoverySession(
       const base::Closure& callback,
-      const ErrorCallback& error_callback) OVERRIDE {
+      const ErrorCallback& error_callback) override {
   }
 
   virtual void RemoveDiscoverySession(
       const base::Closure& callback,
-      const ErrorCallback& error_callback) OVERRIDE {
+      const ErrorCallback& error_callback) override {
   }
 
   virtual void RemovePairingDelegateInternal(
-      BluetoothDevice::PairingDelegate* pairing_delegate) OVERRIDE {
+      BluetoothDevice::PairingDelegate* pairing_delegate) override {
   }
 };
 
 class TestPairingDelegate : public BluetoothDevice::PairingDelegate {
   public:
-   virtual void RequestPinCode(BluetoothDevice* device) OVERRIDE {}
-   virtual void RequestPasskey(BluetoothDevice* device) OVERRIDE {}
+   virtual void RequestPinCode(BluetoothDevice* device) override {}
+   virtual void RequestPasskey(BluetoothDevice* device) override {}
    virtual void DisplayPinCode(BluetoothDevice* device,
-                               const std::string& pincode) OVERRIDE {}
+                               const std::string& pincode) override {}
    virtual void DisplayPasskey(BluetoothDevice* device,
-                               uint32 passkey) OVERRIDE {}
+                               uint32 passkey) override {}
    virtual void KeysEntered(BluetoothDevice* device,
-                            uint32 entered) OVERRIDE {}
+                            uint32 entered) override {}
    virtual void ConfirmPasskey(BluetoothDevice* device,
-                               uint32 passkey) OVERRIDE {}
-   virtual void AuthorizePairing(BluetoothDevice* device) OVERRIDE {}
+                               uint32 passkey) override {}
+   virtual void AuthorizePairing(BluetoothDevice* device) override {}
 };
 
 
diff --git a/device/bluetooth/bluetooth_adapter_win.h b/device/bluetooth/bluetooth_adapter_win.h
index a6b3609..6d62d2e 100644
--- a/device/bluetooth/bluetooth_adapter_win.h
+++ b/device/bluetooth/bluetooth_adapter_win.h
@@ -35,44 +35,44 @@ class BluetoothAdapterWin : public BluetoothAdapter,
       const InitCallback& init_callback);
 
   // BluetoothAdapter:
-  virtual void AddObserver(BluetoothAdapter::Observer* observer) OVERRIDE;
-  virtual void RemoveObserver(BluetoothAdapter::Observer* observer) OVERRIDE;
-  virtual std::string GetAddress() const OVERRIDE;
-  virtual std::string GetName() const OVERRIDE;
+  virtual void AddObserver(BluetoothAdapter::Observer* observer) override;
+  virtual void RemoveObserver(BluetoothAdapter::Observer* observer) override;
+  virtual std::string GetAddress() const override;
+  virtual std::string GetName() const override;
   virtual void SetName(const std::string& name,
                        const base::Closure& callback,
-                       const ErrorCallback& error_callback) OVERRIDE;
-  virtual bool IsInitialized() const OVERRIDE;
-  virtual bool IsPresent() const OVERRIDE;
-  virtual bool IsPowered() const OVERRIDE;
+                       const ErrorCallback& error_callback) override;
+  virtual bool IsInitialized() const override;
+  virtual bool IsPresent() const override;
+  virtual bool IsPowered() const override;
   virtual void SetPowered(
       bool discoverable,
       const base::Closure& callback,
-      const ErrorCallback& error_callback) OVERRIDE;
-  virtual bool IsDiscoverable() const OVERRIDE;
+      const ErrorCallback& error_callback) override;
+  virtual bool IsDiscoverable() const override;
   virtual void SetDiscoverable(
       bool discoverable,
       const base::Closure& callback,
-      const ErrorCallback& error_callback) OVERRIDE;
-  virtual bool IsDiscovering() const OVERRIDE;
+      const ErrorCallback& error_callback) override;
+  virtual bool IsDiscovering() const override;
   virtual void CreateRfcommService(
       const BluetoothUUID& uuid,
       const ServiceOptions& options,
       const CreateServiceCallback& callback,
-      const CreateServiceErrorCallback& error_callback) OVERRIDE;
+      const CreateServiceErrorCallback& error_callback) override;
   virtual void CreateL2capService(
       const BluetoothUUID& uuid,
       const ServiceOptions& options,
       const CreateServiceCallback& callback,
-      const CreateServiceErrorCallback& error_callback) OVERRIDE;
+      const CreateServiceErrorCallback& error_callback) override;
 
   // BluetoothTaskManagerWin::Observer override
   virtual void AdapterStateChanged(
-      const BluetoothTaskManagerWin::AdapterState& state) OVERRIDE;
-  virtual void DiscoveryStarted(bool success) OVERRIDE;
-  virtual void DiscoveryStopped() OVERRIDE;
+      const BluetoothTaskManagerWin::AdapterState& state) override;
+  virtual void DiscoveryStarted(bool success) override;
+  virtual void DiscoveryStopped() override;
   virtual void DevicesPolled(const ScopedVector<
-      BluetoothTaskManagerWin::DeviceState>& devices) OVERRIDE;
+      BluetoothTaskManagerWin::DeviceState>& devices) override;
 
   const scoped_refptr<base::SequencedTaskRunner>& ui_task_runner() const {
     return ui_task_runner_;
@@ -84,7 +84,7 @@ class BluetoothAdapterWin : public BluetoothAdapter,
  protected:
   // BluetoothAdapter:
   virtual void RemovePairingDelegateInternal(
-      device::BluetoothDevice::PairingDelegate* pairing_delegate) OVERRIDE;
+      device::BluetoothDevice::PairingDelegate* pairing_delegate) override;
 
  private:
   friend class BluetoothAdapterWinTest;
@@ -102,10 +102,10 @@ class BluetoothAdapterWin : public BluetoothAdapter,
   // BluetoothAdapter:
   virtual void AddDiscoverySession(
       const base::Closure& callback,
-      const ErrorCallback& error_callback) OVERRIDE;
+      const ErrorCallback& error_callback) override;
   virtual void RemoveDiscoverySession(
       const base::Closure& callback,
-      const ErrorCallback& error_callback) OVERRIDE;
+      const ErrorCallback& error_callback) override;
 
   void Init();
   void InitForTest(
diff --git a/device/bluetooth/bluetooth_adapter_win_unittest.cc b/device/bluetooth/bluetooth_adapter_win_unittest.cc
index ed3a304..4a7abd7 100644
--- a/device/bluetooth/bluetooth_adapter_win_unittest.cc
+++ b/device/bluetooth/bluetooth_adapter_win_unittest.cc
@@ -51,33 +51,33 @@ class AdapterObserver : public device::BluetoothAdapter::Observer {
   }
 
   virtual void AdapterPresentChanged(
-      device::BluetoothAdapter* adapter, bool present) OVERRIDE {
+      device::BluetoothAdapter* adapter, bool present) override {
     num_present_changed_++;
   }
 
   virtual void AdapterPoweredChanged(
-      device::BluetoothAdapter* adapter, bool powered) OVERRIDE {
+      device::BluetoothAdapter* adapter, bool powered) override {
     num_powered_changed_++;
   }
 
   virtual void AdapterDiscoveringChanged(
-      device::BluetoothAdapter* adapter, bool discovering) OVERRIDE {
+      device::BluetoothAdapter* adapter, bool discovering) override {
     num_discovering_changed_++;
   }
 
   virtual void DeviceAdded(
       device::BluetoothAdapter* adapter,
-      device::BluetoothDevice* device) OVERRIDE {
+      device::BluetoothDevice* device) override {
     num_device_added_++;
   }
 
   virtual void DeviceRemoved(device::BluetoothAdapter* adapter,
-                             device::BluetoothDevice* device) OVERRIDE {
+                             device::BluetoothDevice* device) override {
     num_device_removed_++;
   }
 
   virtual void DeviceChanged(device::BluetoothAdapter* adapter,
-                             device::BluetoothDevice* device) OVERRIDE {
+                             device::BluetoothDevice* device) override {
     num_device_changed_++;
   }
 
@@ -119,7 +119,7 @@ class BluetoothAdapterWinTest : public testing::Test {
     adapter_win_->InitForTest(ui_task_runner_, bluetooth_task_runner_);
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     adapter_win_->AddObserver(&adapter_observer_);
     num_start_discovery_callbacks_ = 0;
     num_start_discovery_error_callbacks_ = 0;
@@ -127,7 +127,7 @@ class BluetoothAdapterWinTest : public testing::Test {
     num_stop_discovery_error_callbacks_ = 0;
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     adapter_win_->RemoveObserver(&adapter_observer_);
   }
 
diff --git a/device/bluetooth/bluetooth_chromeos_unittest.cc b/device/bluetooth/bluetooth_chromeos_unittest.cc
index e083829..3bb252e 100644
--- a/device/bluetooth/bluetooth_chromeos_unittest.cc
+++ b/device/bluetooth/bluetooth_chromeos_unittest.cc
@@ -55,7 +55,7 @@ class TestObserver : public BluetoothAdapter::Observer {
   }
 
   virtual void AdapterPresentChanged(BluetoothAdapter* adapter,
-                                     bool present) OVERRIDE {
+                                     bool present) override {
     EXPECT_EQ(adapter_.get(), adapter);
 
     ++present_changed_count_;
@@ -63,7 +63,7 @@ class TestObserver : public BluetoothAdapter::Observer {
   }
 
   virtual void AdapterPoweredChanged(BluetoothAdapter* adapter,
-                                     bool powered) OVERRIDE {
+                                     bool powered) override {
     EXPECT_EQ(adapter_.get(), adapter);
 
     ++powered_changed_count_;
@@ -71,14 +71,14 @@ class TestObserver : public BluetoothAdapter::Observer {
   }
 
   virtual void AdapterDiscoverableChanged(BluetoothAdapter* adapter,
-                                          bool discoverable) OVERRIDE {
+                                          bool discoverable) override {
     EXPECT_EQ(adapter_.get(), adapter);
 
     ++discoverable_changed_count_;
   }
 
   virtual void AdapterDiscoveringChanged(BluetoothAdapter* adapter,
-                                         bool discovering) OVERRIDE {
+                                         bool discovering) override {
     EXPECT_EQ(adapter_.get(), adapter);
 
     ++discovering_changed_count_;
@@ -86,7 +86,7 @@ class TestObserver : public BluetoothAdapter::Observer {
   }
 
   virtual void DeviceAdded(BluetoothAdapter* adapter,
-                           BluetoothDevice* device) OVERRIDE {
+                           BluetoothDevice* device) override {
     EXPECT_EQ(adapter_.get(), adapter);
 
     ++device_added_count_;
@@ -97,7 +97,7 @@ class TestObserver : public BluetoothAdapter::Observer {
   }
 
   virtual void DeviceChanged(BluetoothAdapter* adapter,
-                             BluetoothDevice* device) OVERRIDE {
+                             BluetoothDevice* device) override {
     EXPECT_EQ(adapter_.get(), adapter);
 
     ++device_changed_count_;
@@ -108,7 +108,7 @@ class TestObserver : public BluetoothAdapter::Observer {
   }
 
   virtual void DeviceRemoved(BluetoothAdapter* adapter,
-                             BluetoothDevice* device) OVERRIDE {
+                             BluetoothDevice* device) override {
     EXPECT_EQ(adapter_.get(), adapter);
 
     ++device_removed_count_;
@@ -160,20 +160,20 @@ class TestPairingDelegate : public BluetoothDevice::PairingDelegate {
         last_entered_(999U) {}
   virtual ~TestPairingDelegate() {}
 
-  virtual void RequestPinCode(BluetoothDevice* device) OVERRIDE {
+  virtual void RequestPinCode(BluetoothDevice* device) override {
     ++call_count_;
     ++request_pincode_count_;
     QuitMessageLoop();
   }
 
-  virtual void RequestPasskey(BluetoothDevice* device) OVERRIDE {
+  virtual void RequestPasskey(BluetoothDevice* device) override {
     ++call_count_;
     ++request_passkey_count_;
     QuitMessageLoop();
   }
 
   virtual void DisplayPinCode(BluetoothDevice* device,
-                              const std::string& pincode) OVERRIDE {
+                              const std::string& pincode) override {
     ++call_count_;
     ++display_pincode_count_;
     last_pincode_ = pincode;
@@ -181,14 +181,14 @@ class TestPairingDelegate : public BluetoothDevice::PairingDelegate {
   }
 
   virtual void DisplayPasskey(BluetoothDevice* device,
-                              uint32 passkey) OVERRIDE {
+                              uint32 passkey) override {
     ++call_count_;
     ++display_passkey_count_;
     last_passkey_ = passkey;
     QuitMessageLoop();
   }
 
-  virtual void KeysEntered(BluetoothDevice* device, uint32 entered) OVERRIDE {
+  virtual void KeysEntered(BluetoothDevice* device, uint32 entered) override {
     ++call_count_;
     ++keys_entered_count_;
     last_entered_ = entered;
@@ -196,14 +196,14 @@ class TestPairingDelegate : public BluetoothDevice::PairingDelegate {
   }
 
   virtual void ConfirmPasskey(BluetoothDevice* device,
-                              uint32 passkey) OVERRIDE {
+                              uint32 passkey) override {
     ++call_count_;
     ++confirm_passkey_count_;
     last_passkey_ = passkey;
     QuitMessageLoop();
   }
 
-  virtual void AuthorizePairing(BluetoothDevice* device) OVERRIDE {
+  virtual void AuthorizePairing(BluetoothDevice* device) override {
     ++call_count_;
     ++authorize_pairing_count_;
     QuitMessageLoop();
diff --git a/device/bluetooth/bluetooth_device_chromeos.h b/device/bluetooth/bluetooth_device_chromeos.h
index 85ed070..aa12e0b 100644
--- a/device/bluetooth/bluetooth_device_chromeos.h
+++ b/device/bluetooth/bluetooth_device_chromeos.h
@@ -32,46 +32,46 @@ class BluetoothDeviceChromeOS
       public BluetoothGattServiceClient::Observer {
  public:
   // BluetoothDevice override
-  virtual uint32 GetBluetoothClass() const OVERRIDE;
-  virtual std::string GetAddress() const OVERRIDE;
-  virtual VendorIDSource GetVendorIDSource() const OVERRIDE;
-  virtual uint16 GetVendorID() const OVERRIDE;
-  virtual uint16 GetProductID() const OVERRIDE;
-  virtual uint16 GetDeviceID() const OVERRIDE;
-  virtual int GetRSSI() const OVERRIDE;
-  virtual int GetCurrentHostTransmitPower() const OVERRIDE;
-  virtual int GetMaximumHostTransmitPower() const OVERRIDE;
-  virtual bool IsPaired() const OVERRIDE;
-  virtual bool IsConnected() const OVERRIDE;
-  virtual bool IsConnectable() const OVERRIDE;
-  virtual bool IsConnecting() const OVERRIDE;
-  virtual UUIDList GetUUIDs() const OVERRIDE;
-  virtual bool ExpectingPinCode() const OVERRIDE;
-  virtual bool ExpectingPasskey() const OVERRIDE;
-  virtual bool ExpectingConfirmation() const OVERRIDE;
+  virtual uint32 GetBluetoothClass() const override;
+  virtual std::string GetAddress() const override;
+  virtual VendorIDSource GetVendorIDSource() const override;
+  virtual uint16 GetVendorID() const override;
+  virtual uint16 GetProductID() const override;
+  virtual uint16 GetDeviceID() const override;
+  virtual int GetRSSI() const override;
+  virtual int GetCurrentHostTransmitPower() const override;
+  virtual int GetMaximumHostTransmitPower() const override;
+  virtual bool IsPaired() const override;
+  virtual bool IsConnected() const override;
+  virtual bool IsConnectable() const override;
+  virtual bool IsConnecting() const override;
+  virtual UUIDList GetUUIDs() const override;
+  virtual bool ExpectingPinCode() const override;
+  virtual bool ExpectingPasskey() const override;
+  virtual bool ExpectingConfirmation() const override;
   virtual void Connect(
       device::BluetoothDevice::PairingDelegate* pairing_delegate,
       const base::Closure& callback,
-      const ConnectErrorCallback& error_callback) OVERRIDE;
-  virtual void SetPinCode(const std::string& pincode) OVERRIDE;
-  virtual void SetPasskey(uint32 passkey) OVERRIDE;
-  virtual void ConfirmPairing() OVERRIDE;
-  virtual void RejectPairing() OVERRIDE;
-  virtual void CancelPairing() OVERRIDE;
+      const ConnectErrorCallback& error_callback) override;
+  virtual void SetPinCode(const std::string& pincode) override;
+  virtual void SetPasskey(uint32 passkey) override;
+  virtual void ConfirmPairing() override;
+  virtual void RejectPairing() override;
+  virtual void CancelPairing() override;
   virtual void Disconnect(
       const base::Closure& callback,
-      const ErrorCallback& error_callback) OVERRIDE;
-  virtual void Forget(const ErrorCallback& error_callback) OVERRIDE;
+      const ErrorCallback& error_callback) override;
+  virtual void Forget(const ErrorCallback& error_callback) override;
   virtual void ConnectToService(
       const device::BluetoothUUID& uuid,
       const ConnectToServiceCallback& callback,
-      const ConnectToServiceErrorCallback& error_callback) OVERRIDE;
+      const ConnectToServiceErrorCallback& error_callback) override;
   virtual void CreateGattConnection(
       const GattConnectionCallback& callback,
-      const ConnectErrorCallback& error_callback) OVERRIDE;
+      const ConnectErrorCallback& error_callback) override;
   virtual void StartConnectionMonitor(
       const base::Closure& callback,
-      const ErrorCallback& error_callback) OVERRIDE;
+      const ErrorCallback& error_callback) override;
 
   // Attempts to initiate an insecure outgoing L2CAP or RFCOMM connection to the
   // advertised service on this device matching |uuid|, performing an SDP lookup
@@ -104,7 +104,7 @@ class BluetoothDeviceChromeOS
 
  protected:
    // BluetoothDevice override
-  virtual std::string GetDeviceName() const OVERRIDE;
+  virtual std::string GetDeviceName() const override;
 
  private:
   friend class BluetoothAdapterChromeOS;
@@ -117,8 +117,8 @@ class BluetoothDeviceChromeOS
   virtual ~BluetoothDeviceChromeOS();
 
   // BluetoothGattServiceClient::Observer overrides.
-  virtual void GattServiceAdded(const dbus::ObjectPath& object_path) OVERRIDE;
-  virtual void GattServiceRemoved(const dbus::ObjectPath& object_path) OVERRIDE;
+  virtual void GattServiceAdded(const dbus::ObjectPath& object_path) override;
+  virtual void GattServiceRemoved(const dbus::ObjectPath& object_path) override;
 
   // Internal method to initiate a connection to this device, and methods called
   // by dbus:: on completion of the D-Bus method call.
diff --git a/device/bluetooth/bluetooth_device_mac.h b/device/bluetooth/bluetooth_device_mac.h
index b107573..eed7816 100644
--- a/device/bluetooth/bluetooth_device_mac.h
+++ b/device/bluetooth/bluetooth_device_mac.h
@@ -24,46 +24,46 @@ class BluetoothDeviceMac : public BluetoothDevice {
   virtual ~BluetoothDeviceMac();
 
   // BluetoothDevice override
-  virtual uint32 GetBluetoothClass() const OVERRIDE;
-  virtual std::string GetAddress() const OVERRIDE;
-  virtual VendorIDSource GetVendorIDSource() const OVERRIDE;
-  virtual uint16 GetVendorID() const OVERRIDE;
-  virtual uint16 GetProductID() const OVERRIDE;
-  virtual uint16 GetDeviceID() const OVERRIDE;
-  virtual int GetRSSI() const OVERRIDE;
-  virtual int GetCurrentHostTransmitPower() const OVERRIDE;
-  virtual int GetMaximumHostTransmitPower() const OVERRIDE;
-  virtual bool IsPaired() const OVERRIDE;
-  virtual bool IsConnected() const OVERRIDE;
-  virtual bool IsConnectable() const OVERRIDE;
-  virtual bool IsConnecting() const OVERRIDE;
-  virtual UUIDList GetUUIDs() const OVERRIDE;
-  virtual bool ExpectingPinCode() const OVERRIDE;
-  virtual bool ExpectingPasskey() const OVERRIDE;
-  virtual bool ExpectingConfirmation() const OVERRIDE;
+  virtual uint32 GetBluetoothClass() const override;
+  virtual std::string GetAddress() const override;
+  virtual VendorIDSource GetVendorIDSource() const override;
+  virtual uint16 GetVendorID() const override;
+  virtual uint16 GetProductID() const override;
+  virtual uint16 GetDeviceID() const override;
+  virtual int GetRSSI() const override;
+  virtual int GetCurrentHostTransmitPower() const override;
+  virtual int GetMaximumHostTransmitPower() const override;
+  virtual bool IsPaired() const override;
+  virtual bool IsConnected() const override;
+  virtual bool IsConnectable() const override;
+  virtual bool IsConnecting() const override;
+  virtual UUIDList GetUUIDs() const override;
+  virtual bool ExpectingPinCode() const override;
+  virtual bool ExpectingPasskey() const override;
+  virtual bool ExpectingConfirmation() const override;
   virtual void Connect(
       PairingDelegate* pairing_delegate,
       const base::Closure& callback,
-      const ConnectErrorCallback& error_callback) OVERRIDE;
-  virtual void SetPinCode(const std::string& pincode) OVERRIDE;
-  virtual void SetPasskey(uint32 passkey) OVERRIDE;
-  virtual void ConfirmPairing() OVERRIDE;
-  virtual void RejectPairing() OVERRIDE;
-  virtual void CancelPairing() OVERRIDE;
+      const ConnectErrorCallback& error_callback) override;
+  virtual void SetPinCode(const std::string& pincode) override;
+  virtual void SetPasskey(uint32 passkey) override;
+  virtual void ConfirmPairing() override;
+  virtual void RejectPairing() override;
+  virtual void CancelPairing() override;
   virtual void Disconnect(
       const base::Closure& callback,
-      const ErrorCallback& error_callback) OVERRIDE;
-  virtual void Forget(const ErrorCallback& error_callback) OVERRIDE;
+      const ErrorCallback& error_callback) override;
+  virtual void Forget(const ErrorCallback& error_callback) override;
   virtual void ConnectToService(
       const BluetoothUUID& uuid,
       const ConnectToServiceCallback& callback,
-      const ConnectToServiceErrorCallback& error_callback) OVERRIDE;
+      const ConnectToServiceErrorCallback& error_callback) override;
   virtual void CreateGattConnection(
       const GattConnectionCallback& callback,
-      const ConnectErrorCallback& error_callback) OVERRIDE;
+      const ConnectErrorCallback& error_callback) override;
   virtual void StartConnectionMonitor(
       const base::Closure& callback,
-      const ErrorCallback& error_callback) OVERRIDE;
+      const ErrorCallback& error_callback) override;
 
   // Returns the timestamp when the device was last seen during an inquiry.
   // Returns nil if the device has never been seen during an inquiry.
@@ -75,7 +75,7 @@ class BluetoothDeviceMac : public BluetoothDevice {
 
  protected:
   // BluetoothDevice override
-  virtual std::string GetDeviceName() const OVERRIDE;
+  virtual std::string GetDeviceName() const override;
 
  private:
   friend class BluetoothAdapterMac;
diff --git a/device/bluetooth/bluetooth_device_win.h b/device/bluetooth/bluetooth_device_win.h
index 8479fbe..ddbde8e 100644
--- a/device/bluetooth/bluetooth_device_win.h
+++ b/device/bluetooth/bluetooth_device_win.h
@@ -30,46 +30,46 @@ class BluetoothDeviceWin : public BluetoothDevice {
   virtual ~BluetoothDeviceWin();
 
   // BluetoothDevice override
-  virtual uint32 GetBluetoothClass() const OVERRIDE;
-  virtual std::string GetAddress() const OVERRIDE;
-  virtual VendorIDSource GetVendorIDSource() const OVERRIDE;
-  virtual uint16 GetVendorID() const OVERRIDE;
-  virtual uint16 GetProductID() const OVERRIDE;
-  virtual uint16 GetDeviceID() const OVERRIDE;
-  virtual int GetRSSI() const OVERRIDE;
-  virtual int GetCurrentHostTransmitPower() const OVERRIDE;
-  virtual int GetMaximumHostTransmitPower() const OVERRIDE;
-  virtual bool IsPaired() const OVERRIDE;
-  virtual bool IsConnected() const OVERRIDE;
-  virtual bool IsConnectable() const OVERRIDE;
-  virtual bool IsConnecting() const OVERRIDE;
-  virtual UUIDList GetUUIDs() const OVERRIDE;
-  virtual bool ExpectingPinCode() const OVERRIDE;
-  virtual bool ExpectingPasskey() const OVERRIDE;
-  virtual bool ExpectingConfirmation() const OVERRIDE;
+  virtual uint32 GetBluetoothClass() const override;
+  virtual std::string GetAddress() const override;
+  virtual VendorIDSource GetVendorIDSource() const override;
+  virtual uint16 GetVendorID() const override;
+  virtual uint16 GetProductID() const override;
+  virtual uint16 GetDeviceID() const override;
+  virtual int GetRSSI() const override;
+  virtual int GetCurrentHostTransmitPower() const override;
+  virtual int GetMaximumHostTransmitPower() const override;
+  virtual bool IsPaired() const override;
+  virtual bool IsConnected() const override;
+  virtual bool IsConnectable() const override;
+  virtual bool IsConnecting() const override;
+  virtual UUIDList GetUUIDs() const override;
+  virtual bool ExpectingPinCode() const override;
+  virtual bool ExpectingPasskey() const override;
+  virtual bool ExpectingConfirmation() const override;
   virtual void Connect(
       PairingDelegate* pairing_delegate,
       const base::Closure& callback,
-      const ConnectErrorCallback& error_callback) OVERRIDE;
-  virtual void SetPinCode(const std::string& pincode) OVERRIDE;
-  virtual void SetPasskey(uint32 passkey) OVERRIDE;
-  virtual void ConfirmPairing() OVERRIDE;
-  virtual void RejectPairing() OVERRIDE;
-  virtual void CancelPairing() OVERRIDE;
+      const ConnectErrorCallback& error_callback) override;
+  virtual void SetPinCode(const std::string& pincode) override;
+  virtual void SetPasskey(uint32 passkey) override;
+  virtual void ConfirmPairing() override;
+  virtual void RejectPairing() override;
+  virtual void CancelPairing() override;
   virtual void Disconnect(
       const base::Closure& callback,
-      const ErrorCallback& error_callback) OVERRIDE;
-  virtual void Forget(const ErrorCallback& error_callback) OVERRIDE;
+      const ErrorCallback& error_callback) override;
+  virtual void Forget(const ErrorCallback& error_callback) override;
   virtual void ConnectToService(
       const BluetoothUUID& uuid,
       const ConnectToServiceCallback& callback,
-      const ConnectToServiceErrorCallback& error_callback) OVERRIDE;
+      const ConnectToServiceErrorCallback& error_callback) override;
   virtual void CreateGattConnection(
       const GattConnectionCallback& callback,
-      const ConnectErrorCallback& error_callback) OVERRIDE;
+      const ConnectErrorCallback& error_callback) override;
   virtual void StartConnectionMonitor(
       const base::Closure& callback,
-      const ErrorCallback& error_callback) OVERRIDE;
+      const ErrorCallback& error_callback) override;
 
   // Used by BluetoothProfileWin to retrieve the service record for the given
   // |uuid|.
@@ -86,7 +86,7 @@ class BluetoothDeviceWin : public BluetoothDevice {
 
  protected:
   // BluetoothDevice override
-  virtual std::string GetDeviceName() const OVERRIDE;
+  virtual std::string GetDeviceName() const override;
 
  private:
   friend class BluetoothAdapterWin;
diff --git a/device/bluetooth/bluetooth_discovery_manager_mac.mm b/device/bluetooth/bluetooth_discovery_manager_mac.mm
index 2262891..abc9cd8 100644
--- a/device/bluetooth/bluetooth_discovery_manager_mac.mm
+++ b/device/bluetooth/bluetooth_discovery_manager_mac.mm
@@ -47,10 +47,10 @@ class BluetoothDiscoveryManagerMacClassic
   virtual ~BluetoothDiscoveryManagerMacClassic() {}
 
   // BluetoothDiscoveryManagerMac override.
-  virtual bool IsDiscovering() const OVERRIDE { return should_do_discovery_; }
+  virtual bool IsDiscovering() const override { return should_do_discovery_; }
 
   // BluetoothDiscoveryManagerMac override.
-  virtual bool StartDiscovery() OVERRIDE {
+  virtual bool StartDiscovery() override {
     DVLOG(1) << "Bluetooth Classic: StartDiscovery";
     DCHECK(!should_do_discovery_);
 
@@ -78,7 +78,7 @@ class BluetoothDiscoveryManagerMacClassic
   }
 
   // BluetoothDiscoveryManagerMac override.
-  virtual bool StopDiscovery() OVERRIDE {
+  virtual bool StopDiscovery() override {
     DVLOG(1) << "Bluetooth Classic: StopDiscovery";
     DCHECK(should_do_discovery_);
 
diff --git a/device/bluetooth/bluetooth_gatt_chromeos_unittest.cc b/device/bluetooth/bluetooth_gatt_chromeos_unittest.cc
index 60cd54c..636b467 100644
--- a/device/bluetooth/bluetooth_gatt_chromeos_unittest.cc
+++ b/device/bluetooth/bluetooth_gatt_chromeos_unittest.cc
@@ -81,7 +81,7 @@ class TestObserver : public BluetoothAdapter::Observer {
   // BluetoothAdapter::Observer overrides.
   virtual void GattServiceAdded(BluetoothAdapter* adapter,
                                 BluetoothDevice* device,
-                                BluetoothGattService* service) OVERRIDE {
+                                BluetoothGattService* service) override {
     ASSERT_EQ(adapter_.get(), adapter);
     ASSERT_EQ(service->GetDevice(), device);
 
@@ -99,7 +99,7 @@ class TestObserver : public BluetoothAdapter::Observer {
 
   virtual void GattServiceRemoved(BluetoothAdapter* adapter,
                                   BluetoothDevice* device,
-                                  BluetoothGattService* service) OVERRIDE {
+                                  BluetoothGattService* service) override {
     ASSERT_EQ(adapter_.get(), adapter);
     ASSERT_EQ(service->GetDevice(), device);
 
@@ -118,7 +118,7 @@ class TestObserver : public BluetoothAdapter::Observer {
 
   virtual void GattDiscoveryCompleteForService(
       BluetoothAdapter* adapter,
-      BluetoothGattService* service) OVERRIDE {
+      BluetoothGattService* service) override {
     ASSERT_EQ(adapter_.get(), adapter);
     ++gatt_discovery_complete_count_;
 
@@ -126,7 +126,7 @@ class TestObserver : public BluetoothAdapter::Observer {
   }
 
   virtual void GattServiceChanged(BluetoothAdapter* adapter,
-                                  BluetoothGattService* service) OVERRIDE {
+                                  BluetoothGattService* service) override {
     ASSERT_EQ(adapter_.get(), adapter);
     ++gatt_service_changed_count_;
 
@@ -135,7 +135,7 @@ class TestObserver : public BluetoothAdapter::Observer {
 
   virtual void GattCharacteristicAdded(
       BluetoothAdapter* adapter,
-      BluetoothGattCharacteristic* characteristic) OVERRIDE {
+      BluetoothGattCharacteristic* characteristic) override {
     ASSERT_EQ(adapter_.get(), adapter);
 
     ++gatt_characteristic_added_count_;
@@ -152,7 +152,7 @@ class TestObserver : public BluetoothAdapter::Observer {
 
   virtual void GattCharacteristicRemoved(
       BluetoothAdapter* adapter,
-      BluetoothGattCharacteristic* characteristic) OVERRIDE {
+      BluetoothGattCharacteristic* characteristic) override {
     ASSERT_EQ(adapter_.get(), adapter);
 
     ++gatt_characteristic_removed_count_;
@@ -170,7 +170,7 @@ class TestObserver : public BluetoothAdapter::Observer {
   virtual void GattCharacteristicValueChanged(
       BluetoothAdapter* adapter,
       BluetoothGattCharacteristic* characteristic,
-      const std::vector<uint8>& value) OVERRIDE {
+      const std::vector<uint8>& value) override {
     ASSERT_EQ(adapter_.get(), adapter);
 
     ++gatt_characteristic_value_changed_count_;
@@ -188,7 +188,7 @@ class TestObserver : public BluetoothAdapter::Observer {
 
   virtual void GattDescriptorAdded(
       BluetoothAdapter* adapter,
-      BluetoothGattDescriptor* descriptor) OVERRIDE {
+      BluetoothGattDescriptor* descriptor) override {
     ASSERT_EQ(adapter_.get(), adapter);
 
     ++gatt_descriptor_added_count_;
@@ -205,7 +205,7 @@ class TestObserver : public BluetoothAdapter::Observer {
 
   virtual void GattDescriptorRemoved(
       BluetoothAdapter* adapter,
-      BluetoothGattDescriptor* descriptor) OVERRIDE {
+      BluetoothGattDescriptor* descriptor) override {
     ASSERT_EQ(adapter_.get(), adapter);
 
     ++gatt_descriptor_removed_count_;
@@ -223,7 +223,7 @@ class TestObserver : public BluetoothAdapter::Observer {
   virtual void GattDescriptorValueChanged(
       BluetoothAdapter* adapter,
       BluetoothGattDescriptor* descriptor,
-      const std::vector<uint8>& value) OVERRIDE {
+      const std::vector<uint8>& value) override {
     ASSERT_EQ(adapter_.get(), adapter);
 
     ++gatt_descriptor_value_changed_count_;
diff --git a/device/bluetooth/bluetooth_gatt_connection_chromeos.h b/device/bluetooth/bluetooth_gatt_connection_chromeos.h
index beade19..5f5c4bf 100644
--- a/device/bluetooth/bluetooth_gatt_connection_chromeos.h
+++ b/device/bluetooth/bluetooth_gatt_connection_chromeos.h
@@ -34,16 +34,16 @@ class BluetoothGattConnectionChromeOS
   virtual ~BluetoothGattConnectionChromeOS();
 
   // BluetoothGattConnection overrides.
-  virtual std::string GetDeviceAddress() const OVERRIDE;
-  virtual bool IsConnected() OVERRIDE;
-  virtual void Disconnect(const base::Closure& callback) OVERRIDE;
+  virtual std::string GetDeviceAddress() const override;
+  virtual bool IsConnected() override;
+  virtual void Disconnect(const base::Closure& callback) override;
 
  private:
 
   // chromeos::BluetoothDeviceClient::Observer overrides.
-  virtual void DeviceRemoved(const dbus::ObjectPath& object_path) OVERRIDE;
+  virtual void DeviceRemoved(const dbus::ObjectPath& object_path) override;
   virtual void DevicePropertyChanged(const dbus::ObjectPath& object_path,
-                                     const std::string& property_name) OVERRIDE;
+                                     const std::string& property_name) override;
 
   // True, if the connection is currently active.
   bool connected_;
diff --git a/device/bluetooth/bluetooth_gatt_notify_session_chromeos.h b/device/bluetooth/bluetooth_gatt_notify_session_chromeos.h
index 1202fd8..3ad3843 100644
--- a/device/bluetooth/bluetooth_gatt_notify_session_chromeos.h
+++ b/device/bluetooth/bluetooth_gatt_notify_session_chromeos.h
@@ -30,9 +30,9 @@ class BluetoothGattNotifySessionChromeOS
   virtual ~BluetoothGattNotifySessionChromeOS();
 
   // BluetoothGattNotifySession overrides.
-  virtual std::string GetCharacteristicIdentifier() const OVERRIDE;
-  virtual bool IsActive() OVERRIDE;
-  virtual void Stop(const base::Closure& callback) OVERRIDE;
+  virtual std::string GetCharacteristicIdentifier() const override;
+  virtual bool IsActive() override;
+  virtual void Stop(const base::Closure& callback) override;
 
  private:
   friend class BluetoothRemoteGattCharacteristicChromeOS;
@@ -46,10 +46,10 @@ class BluetoothGattNotifySessionChromeOS
 
   // BluetoothGattCharacteristicClient::Observer overrides.
   virtual void GattCharacteristicRemoved(
-      const dbus::ObjectPath& object_path) OVERRIDE;
+      const dbus::ObjectPath& object_path) override;
   virtual void GattCharacteristicPropertyChanged(
       const dbus::ObjectPath& object_path,
-      const std::string& property_name) OVERRIDE;
+      const std::string& property_name) override;
 
   // True, if this session is currently active.
   bool active_;
diff --git a/device/bluetooth/bluetooth_l2cap_channel_mac.h b/device/bluetooth/bluetooth_l2cap_channel_mac.h
index f843608..eafe8f5 100644
--- a/device/bluetooth/bluetooth_l2cap_channel_mac.h
+++ b/device/bluetooth/bluetooth_l2cap_channel_mac.h
@@ -37,12 +37,12 @@ class BluetoothL2capChannelMac : public BluetoothChannelMac {
       IOReturn* status);
 
   // BluetoothChannelMac:
-  virtual void SetSocket(BluetoothSocketMac* socket) OVERRIDE;
-  virtual IOBluetoothDevice* GetDevice() OVERRIDE;
-  virtual uint16_t GetOutgoingMTU() OVERRIDE;
+  virtual void SetSocket(BluetoothSocketMac* socket) override;
+  virtual IOBluetoothDevice* GetDevice() override;
+  virtual uint16_t GetOutgoingMTU() override;
   virtual IOReturn WriteAsync(void* data,
                               uint16_t length,
-                              void* refcon) OVERRIDE;
+                              void* refcon) override;
 
   void OnChannelOpenComplete(IOBluetoothL2CAPChannel* channel,
                              IOReturn status);
diff --git a/device/bluetooth/bluetooth_remote_gatt_characteristic_chromeos.h b/device/bluetooth/bluetooth_remote_gatt_characteristic_chromeos.h
index 26fda0b..ab0ce0b 100644
--- a/device/bluetooth/bluetooth_remote_gatt_characteristic_chromeos.h
+++ b/device/bluetooth/bluetooth_remote_gatt_characteristic_chromeos.h
@@ -39,30 +39,30 @@ class BluetoothRemoteGattCharacteristicChromeOS
       public BluetoothGattDescriptorClient::Observer {
  public:
   // device::BluetoothGattCharacteristic overrides.
-  virtual std::string GetIdentifier() const OVERRIDE;
-  virtual device::BluetoothUUID GetUUID() const OVERRIDE;
-  virtual bool IsLocal() const OVERRIDE;
-  virtual const std::vector<uint8>& GetValue() const OVERRIDE;
-  virtual device::BluetoothGattService* GetService() const OVERRIDE;
-  virtual Properties GetProperties() const OVERRIDE;
-  virtual Permissions GetPermissions() const OVERRIDE;
-  virtual bool IsNotifying() const OVERRIDE;
+  virtual std::string GetIdentifier() const override;
+  virtual device::BluetoothUUID GetUUID() const override;
+  virtual bool IsLocal() const override;
+  virtual const std::vector<uint8>& GetValue() const override;
+  virtual device::BluetoothGattService* GetService() const override;
+  virtual Properties GetProperties() const override;
+  virtual Permissions GetPermissions() const override;
+  virtual bool IsNotifying() const override;
   virtual std::vector<device::BluetoothGattDescriptor*>
-      GetDescriptors() const OVERRIDE;
+      GetDescriptors() const override;
   virtual device::BluetoothGattDescriptor* GetDescriptor(
-      const std::string& identifier) const OVERRIDE;
+      const std::string& identifier) const override;
   virtual bool AddDescriptor(
-      device::BluetoothGattDescriptor* descriptor) OVERRIDE;
-  virtual bool UpdateValue(const std::vector<uint8>& value) OVERRIDE;
+      device::BluetoothGattDescriptor* descriptor) override;
+  virtual bool UpdateValue(const std::vector<uint8>& value) override;
   virtual void ReadRemoteCharacteristic(
       const ValueCallback& callback,
-      const ErrorCallback& error_callback) OVERRIDE;
+      const ErrorCallback& error_callback) override;
   virtual void WriteRemoteCharacteristic(
       const std::vector<uint8>& new_value,
       const base::Closure& callback,
-      const ErrorCallback& error_callback) OVERRIDE;
+      const ErrorCallback& error_callback) override;
   virtual void StartNotifySession(const NotifySessionCallback& callback,
-                                  const ErrorCallback& error_callback) OVERRIDE;
+                                  const ErrorCallback& error_callback) override;
 
   // Removes one value update session and invokes |callback| on completion. This
   // decrements the session reference count by 1 and if the number reaches 0,
@@ -84,13 +84,13 @@ class BluetoothRemoteGattCharacteristicChromeOS
   // BluetoothGattCharacteristicClient::Observer overrides.
   virtual void GattCharacteristicValueUpdated(
       const dbus::ObjectPath& object_path,
-      const std::vector<uint8>& value) OVERRIDE;
+      const std::vector<uint8>& value) override;
 
   // BluetoothGattDescriptorClient::Observer overrides.
   virtual void GattDescriptorAdded(
-      const dbus::ObjectPath& object_path) OVERRIDE;
+      const dbus::ObjectPath& object_path) override;
   virtual void GattDescriptorRemoved(
-      const dbus::ObjectPath& object_path) OVERRIDE;
+      const dbus::ObjectPath& object_path) override;
 
   // Called by dbus:: on successful completion of a request to read
   // the characteristic value.
diff --git a/device/bluetooth/bluetooth_remote_gatt_descriptor_chromeos.h b/device/bluetooth/bluetooth_remote_gatt_descriptor_chromeos.h
index d4ea1e6..f4a2a11 100644
--- a/device/bluetooth/bluetooth_remote_gatt_descriptor_chromeos.h
+++ b/device/bluetooth/bluetooth_remote_gatt_descriptor_chromeos.h
@@ -30,21 +30,21 @@ class BluetoothRemoteGattDescriptorChromeOS
     : public device::BluetoothGattDescriptor {
  public:
   // device::BluetoothGattDescriptor overrides.
-  virtual std::string GetIdentifier() const OVERRIDE;
-  virtual device::BluetoothUUID GetUUID() const OVERRIDE;
-  virtual bool IsLocal() const OVERRIDE;
-  virtual const std::vector<uint8>& GetValue() const OVERRIDE;
+  virtual std::string GetIdentifier() const override;
+  virtual device::BluetoothUUID GetUUID() const override;
+  virtual bool IsLocal() const override;
+  virtual const std::vector<uint8>& GetValue() const override;
   virtual device::BluetoothGattCharacteristic*
-      GetCharacteristic() const OVERRIDE;
+      GetCharacteristic() const override;
   virtual device::BluetoothGattCharacteristic::Permissions
-      GetPermissions() const OVERRIDE;
+      GetPermissions() const override;
   virtual void ReadRemoteDescriptor(
       const ValueCallback& callback,
-      const ErrorCallback& error_callback) OVERRIDE;
+      const ErrorCallback& error_callback) override;
   virtual void WriteRemoteDescriptor(
       const std::vector<uint8>& new_value,
       const base::Closure& callback,
-      const ErrorCallback& error_callback) OVERRIDE;
+      const ErrorCallback& error_callback) override;
 
   // Object path of the underlying D-Bus characteristic.
   const dbus::ObjectPath& object_path() const { return object_path_; }
diff --git a/device/bluetooth/bluetooth_remote_gatt_service_chromeos.h b/device/bluetooth/bluetooth_remote_gatt_service_chromeos.h
index e02b56c..d5d4cad 100644
--- a/device/bluetooth/bluetooth_remote_gatt_service_chromeos.h
+++ b/device/bluetooth/bluetooth_remote_gatt_service_chromeos.h
@@ -40,25 +40,25 @@ class BluetoothRemoteGattServiceChromeOS
       public BluetoothGattCharacteristicClient::Observer {
  public:
   // device::BluetoothGattService overrides.
-  virtual std::string GetIdentifier() const OVERRIDE;
-  virtual device::BluetoothUUID GetUUID() const OVERRIDE;
-  virtual bool IsLocal() const OVERRIDE;
-  virtual bool IsPrimary() const OVERRIDE;
-  virtual device::BluetoothDevice* GetDevice() const OVERRIDE;
+  virtual std::string GetIdentifier() const override;
+  virtual device::BluetoothUUID GetUUID() const override;
+  virtual bool IsLocal() const override;
+  virtual bool IsPrimary() const override;
+  virtual device::BluetoothDevice* GetDevice() const override;
   virtual std::vector<device::BluetoothGattCharacteristic*>
-      GetCharacteristics() const OVERRIDE;
+      GetCharacteristics() const override;
   virtual std::vector<device::BluetoothGattService*>
-      GetIncludedServices() const OVERRIDE;
+      GetIncludedServices() const override;
   virtual device::BluetoothGattCharacteristic* GetCharacteristic(
-      const std::string& identifier) const OVERRIDE;
+      const std::string& identifier) const override;
   virtual bool AddCharacteristic(
-      device::BluetoothGattCharacteristic* characteristic) OVERRIDE;
+      device::BluetoothGattCharacteristic* characteristic) override;
   virtual bool AddIncludedService(
-      device::BluetoothGattService* service) OVERRIDE;
+      device::BluetoothGattService* service) override;
   virtual void Register(const base::Closure& callback,
-                        const ErrorCallback& error_callback) OVERRIDE;
+                        const ErrorCallback& error_callback) override;
   virtual void Unregister(const base::Closure& callback,
-                          const ErrorCallback& error_callback) OVERRIDE;
+                          const ErrorCallback& error_callback) override;
 
   // Object path of the underlying service.
   const dbus::ObjectPath& object_path() const { return object_path_; }
@@ -113,16 +113,16 @@ class BluetoothRemoteGattServiceChromeOS
   // BluetoothGattServiceClient::Observer override.
   virtual void GattServicePropertyChanged(
       const dbus::ObjectPath& object_path,
-      const std::string& property_name) OVERRIDE;
+      const std::string& property_name) override;
 
   // BluetoothGattCharacteristicClient::Observer override.
   virtual void GattCharacteristicAdded(
-      const dbus::ObjectPath& object_path) OVERRIDE;
+      const dbus::ObjectPath& object_path) override;
   virtual void GattCharacteristicRemoved(
-      const dbus::ObjectPath& object_path) OVERRIDE;
+      const dbus::ObjectPath& object_path) override;
   virtual void GattCharacteristicPropertyChanged(
       const dbus::ObjectPath& object_path,
-      const std::string& property_name) OVERRIDE;
+      const std::string& property_name) override;
 
   // Object path of the GATT service.
   dbus::ObjectPath object_path_;
diff --git a/device/bluetooth/bluetooth_rfcomm_channel_mac.h b/device/bluetooth/bluetooth_rfcomm_channel_mac.h
index cc64010..665e2d3 100644
--- a/device/bluetooth/bluetooth_rfcomm_channel_mac.h
+++ b/device/bluetooth/bluetooth_rfcomm_channel_mac.h
@@ -37,12 +37,12 @@ class BluetoothRfcommChannelMac : public BluetoothChannelMac {
       IOReturn* status);
 
   // BluetoothChannelMac:
-  virtual void SetSocket(BluetoothSocketMac* socket) OVERRIDE;
-  virtual IOBluetoothDevice* GetDevice() OVERRIDE;
-  virtual uint16_t GetOutgoingMTU() OVERRIDE;
+  virtual void SetSocket(BluetoothSocketMac* socket) override;
+  virtual IOBluetoothDevice* GetDevice() override;
+  virtual uint16_t GetOutgoingMTU() override;
   virtual IOReturn WriteAsync(void* data,
                               uint16_t length,
-                              void* refcon) OVERRIDE;
+                              void* refcon) override;
 
   void OnChannelOpenComplete(IOBluetoothRFCOMMChannel* channel,
                              IOReturn status);
diff --git a/device/bluetooth/bluetooth_socket_chromeos.h b/device/bluetooth/bluetooth_socket_chromeos.h
index ff8ee77..6ea2c21 100644
--- a/device/bluetooth/bluetooth_socket_chromeos.h
+++ b/device/bluetooth/bluetooth_socket_chromeos.h
@@ -70,10 +70,10 @@ class CHROMEOS_EXPORT BluetoothSocketChromeOS
       const ErrorCompletionCallback& error_callback);
 
   // BluetoothSocket:
-  virtual void Close() OVERRIDE;
-  virtual void Disconnect(const base::Closure& callback) OVERRIDE;
+  virtual void Close() override;
+  virtual void Disconnect(const base::Closure& callback) override;
   virtual void Accept(const AcceptCompletionCallback& success_callback,
-                      const ErrorCompletionCallback& error_callback) OVERRIDE;
+                      const ErrorCompletionCallback& error_callback) override;
 
   // Returns the object path of the socket.
   const dbus::ObjectPath& object_path() const { return object_path_; }
@@ -103,7 +103,7 @@ class CHROMEOS_EXPORT BluetoothSocketChromeOS
 
   // BluetoothAdapter::Observer:
   virtual void AdapterPresentChanged(device::BluetoothAdapter* adapter,
-                                     bool present) OVERRIDE;
+                                     bool present) override;
 
   // Called by dbus:: on completion of the RegisterProfile() method call
   // triggered as a result of the adapter becoming present again.
@@ -112,16 +112,16 @@ class CHROMEOS_EXPORT BluetoothSocketChromeOS
                                       const std::string& error_message);
 
   // BluetoothProfileServiceProvider::Delegate:
-  virtual void Released() OVERRIDE;
+  virtual void Released() override;
   virtual void NewConnection(
       const dbus::ObjectPath& device_path,
       scoped_ptr<dbus::FileDescriptor> fd,
       const BluetoothProfileServiceProvider::Delegate::Options& options,
-      const ConfirmationCallback& callback) OVERRIDE;
+      const ConfirmationCallback& callback) override;
   virtual void RequestDisconnection(
       const dbus::ObjectPath& device_path,
-      const ConfirmationCallback& callback) OVERRIDE;
-  virtual void Cancel() OVERRIDE;
+      const ConfirmationCallback& callback) override;
+  virtual void Cancel() override;
 
   // Method run to accept a single incoming connection.
   void AcceptConnectionRequest();
diff --git a/device/bluetooth/bluetooth_socket_chromeos_unittest.cc b/device/bluetooth/bluetooth_socket_chromeos_unittest.cc
index e9ee1df..a86e8f1 100644
--- a/device/bluetooth/bluetooth_socket_chromeos_unittest.cc
+++ b/device/bluetooth/bluetooth_socket_chromeos_unittest.cc
@@ -49,7 +49,7 @@ class BluetoothSocketChromeOSTest : public testing::Test {
         last_bytes_received_(0),
         last_reason_(BluetoothSocket::kSystemError) {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     scoped_ptr<DBusThreadManagerSetter> dbus_setter =
         DBusThreadManager::GetSetterForTesting();
 
@@ -87,7 +87,7 @@ class BluetoothSocketChromeOSTest : public testing::Test {
     ASSERT_TRUE(adapter_->IsPowered());
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     adapter_ = NULL;
     BluetoothSocketThread::CleanupForTesting();
     DBusThreadManager::Shutdown();
diff --git a/device/bluetooth/bluetooth_socket_mac.h b/device/bluetooth/bluetooth_socket_mac.h
index 34f8136..f51f252 100644
--- a/device/bluetooth/bluetooth_socket_mac.h
+++ b/device/bluetooth/bluetooth_socket_mac.h
@@ -75,18 +75,18 @@ class BluetoothSocketMac : public BluetoothSocket {
                         const ErrorCompletionCallback& error_callback);
 
   // BluetoothSocket:
-  virtual void Close() OVERRIDE;
-  virtual void Disconnect(const base::Closure& callback) OVERRIDE;
+  virtual void Close() override;
+  virtual void Disconnect(const base::Closure& callback) override;
   virtual void Receive(
       int /* buffer_size */,
       const ReceiveCompletionCallback& success_callback,
-      const ReceiveErrorCompletionCallback& error_callback) OVERRIDE;
+      const ReceiveErrorCompletionCallback& error_callback) override;
   virtual void Send(scoped_refptr<net::IOBuffer> buffer,
                     int buffer_size,
                     const SendCompletionCallback& success_callback,
-                    const ErrorCompletionCallback& error_callback) OVERRIDE;
+                    const ErrorCompletionCallback& error_callback) override;
   virtual void Accept(const AcceptCompletionCallback& success_callback,
-                      const ErrorCompletionCallback& error_callback) OVERRIDE;
+                      const ErrorCompletionCallback& error_callback) override;
 
   // Callback that is invoked when the OS completes an SDP query.
   // |status| is the returned status from the SDP query, |device| is the
diff --git a/device/bluetooth/bluetooth_socket_net.h b/device/bluetooth/bluetooth_socket_net.h
index b31f0fa..ed6323a 100644
--- a/device/bluetooth/bluetooth_socket_net.h
+++ b/device/bluetooth/bluetooth_socket_net.h
@@ -31,16 +31,16 @@ namespace device {
 class BluetoothSocketNet : public BluetoothSocket {
  public:
   // BluetoothSocket:
-  virtual void Close() OVERRIDE;
-  virtual void Disconnect(const base::Closure& callback) OVERRIDE;
+  virtual void Close() override;
+  virtual void Disconnect(const base::Closure& callback) override;
   virtual void Receive(int buffer_size,
                        const ReceiveCompletionCallback& success_callback,
                        const ReceiveErrorCompletionCallback& error_callback)
-      OVERRIDE;
+      override;
   virtual void Send(scoped_refptr<net::IOBuffer> buffer,
                     int buffer_size,
                     const SendCompletionCallback& success_callback,
-                    const ErrorCompletionCallback& error_callback) OVERRIDE;
+                    const ErrorCompletionCallback& error_callback) override;
 
  protected:
   BluetoothSocketNet(scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
diff --git a/device/bluetooth/bluetooth_socket_win.h b/device/bluetooth/bluetooth_socket_win.h
index c5926b1..38c1664 100644
--- a/device/bluetooth/bluetooth_socket_win.h
+++ b/device/bluetooth/bluetooth_socket_win.h
@@ -55,7 +55,7 @@ class BluetoothSocketWin : public BluetoothSocketNet {
 
   // BluetoothSocket:
   virtual void Accept(const AcceptCompletionCallback& success_callback,
-                      const ErrorCompletionCallback& error_callback) OVERRIDE;
+                      const ErrorCompletionCallback& error_callback) override;
 
  protected:
   virtual ~BluetoothSocketWin();
diff --git a/device/bluetooth/bluetooth_task_manager_win_unittest.cc b/device/bluetooth/bluetooth_task_manager_win_unittest.cc
index d4cd8e5..226db7b 100644
--- a/device/bluetooth/bluetooth_task_manager_win_unittest.cc
+++ b/device/bluetooth/bluetooth_task_manager_win_unittest.cc
@@ -24,15 +24,15 @@ class BluetoothTaskObserver : public device::BluetoothTaskManagerWin::Observer {
   }
 
   virtual void AdapterStateChanged(
-    const device::BluetoothTaskManagerWin::AdapterState& state) OVERRIDE {
+    const device::BluetoothTaskManagerWin::AdapterState& state) override {
     num_adapter_state_changed_++;
   }
 
-  virtual void DiscoveryStarted(bool success) OVERRIDE {
+  virtual void DiscoveryStarted(bool success) override {
     num_discovery_started_++;
   }
 
-  virtual void DiscoveryStopped() OVERRIDE {
+  virtual void DiscoveryStopped() override {
     num_discovery_stopped_++;
   }