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}

19 files changed, 76 insertions, 76 deletions

diff --git a/device/serial/data_receiver.cc b/device/serial/data_receiver.cc
index 5211437..b6e44a9 100644
--- a/device/serial/data_receiver.cc
+++ b/device/serial/data_receiver.cc
@@ -66,10 +66,10 @@ class DataReceiver::PendingReceive::Buffer : public ReadOnlyBuffer {
   virtual ~Buffer();
 
   // ReadOnlyBuffer overrides.
-  virtual const char* GetData() OVERRIDE;
-  virtual uint32_t GetSize() OVERRIDE;
-  virtual void Done(uint32_t bytes_consumed) OVERRIDE;
-  virtual void DoneWithError(uint32_t bytes_consumed, int32_t error) OVERRIDE;
+  virtual const char* GetData() override;
+  virtual uint32_t GetSize() override;
+  virtual void Done(uint32_t bytes_consumed) override;
+  virtual void DoneWithError(uint32_t bytes_consumed, int32_t error) override;
 
  private:
   // The DataReceiver whose data pipe we are providing a view.
diff --git a/device/serial/data_receiver.h b/device/serial/data_receiver.h
index 7e878c3..df37018 100644
--- a/device/serial/data_receiver.h
+++ b/device/serial/data_receiver.h
@@ -47,10 +47,10 @@ class DataReceiver : public base::RefCounted<DataReceiver>,
 
   // serial::DataSourceClient override. Invoked by the DataSource to report
   // errors.
-  virtual void OnError(uint32_t bytes_since_last_error, int32_t error) OVERRIDE;
+  virtual void OnError(uint32_t bytes_since_last_error, int32_t error) override;
 
   // mojo::ErrorHandler override. Calls ShutDown().
-  virtual void OnConnectionError() OVERRIDE;
+  virtual void OnConnectionError() override;
 
   // Invoked by the PendingReceive to report that the user is done with the
   // receive buffer, having read |bytes_read| bytes from it.
diff --git a/device/serial/data_sender.h b/device/serial/data_sender.h
index ab21db4..6e5c89e 100644
--- a/device/serial/data_sender.h
+++ b/device/serial/data_sender.h
@@ -53,14 +53,14 @@ class DataSender : public serial::DataSinkClient, public mojo::ErrorHandler {
   class PendingSend;
 
   // serial::DataSinkClient overrides.
-  virtual void ReportBytesSent(uint32_t bytes_sent) OVERRIDE;
+  virtual void ReportBytesSent(uint32_t bytes_sent) override;
   virtual void ReportBytesSentAndError(
       uint32_t bytes_sent,
       int32_t error,
-      const mojo::Callback<void(uint32_t)>& callback) OVERRIDE;
+      const mojo::Callback<void(uint32_t)>& callback) override;
 
   // mojo::ErrorHandler override.
-  virtual void OnConnectionError() OVERRIDE;
+  virtual void OnConnectionError() override;
 
   // Copies data from |pending_sends_| into the data pipe and starts |waiter_|
   // waiting if the pipe is full. When a PendingSend in |pending_sends_| has
diff --git a/device/serial/data_sink_receiver.cc b/device/serial/data_sink_receiver.cc
index cadc9e3..767f036 100644
--- a/device/serial/data_sink_receiver.cc
+++ b/device/serial/data_sink_receiver.cc
@@ -49,10 +49,10 @@ class DataSinkReceiver::Buffer : public ReadOnlyBuffer {
   void Cancel(int32_t error);
 
   // ReadOnlyBuffer overrides.
-  virtual const char* GetData() OVERRIDE;
-  virtual uint32_t GetSize() OVERRIDE;
-  virtual void Done(uint32_t bytes_read) OVERRIDE;
-  virtual void DoneWithError(uint32_t bytes_read, int32_t error) OVERRIDE;
+  virtual const char* GetData() override;
+  virtual uint32_t GetSize() override;
+  virtual void Done(uint32_t bytes_read) override;
+  virtual void DoneWithError(uint32_t bytes_read, int32_t error) override;
 
  private:
   // The DataSinkReceiver whose data pipe we are providing a view.
diff --git a/device/serial/data_sink_receiver.h b/device/serial/data_sink_receiver.h
index 2e63d7a..75d85e6 100644
--- a/device/serial/data_sink_receiver.h
+++ b/device/serial/data_sink_receiver.h
@@ -49,9 +49,9 @@ class DataSinkReceiver : public base::RefCounted<DataSinkReceiver>,
   virtual ~DataSinkReceiver();
 
   // mojo::InterfaceImpl<serial::DataSink> overrides.
-  virtual void Init(mojo::ScopedDataPipeConsumerHandle handle) OVERRIDE;
-  virtual void Cancel(int32_t error) OVERRIDE;
-  virtual void OnConnectionError() OVERRIDE;
+  virtual void Init(mojo::ScopedDataPipeConsumerHandle handle) override;
+  virtual void Cancel(int32_t error) override;
+  virtual void OnConnectionError() override;
 
   // Starts waiting for |handle_| to be ready for reads.
   void StartWaiting();
diff --git a/device/serial/data_sink_unittest.cc b/device/serial/data_sink_unittest.cc
index 605ccf6..cc983c9 100644
--- a/device/serial/data_sink_unittest.cc
+++ b/device/serial/data_sink_unittest.cc
@@ -35,7 +35,7 @@ class DataSinkTest : public testing::Test {
         seen_connection_error_(false),
         expected_event_(EVENT_NONE) {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     message_loop_.reset(new base::MessageLoop);
     mojo::InterfacePtr<serial::DataSink> sink_handle;
     sink_receiver_ = mojo::WeakBindToProxy(
@@ -47,7 +47,7 @@ class DataSinkTest : public testing::Test {
     sender_.reset(new DataSender(sink_handle.Pass(), kBufferSize, kFatalError));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     read_buffer_.reset();
     message_loop_.reset();
     if (sink_receiver_.get())
diff --git a/device/serial/data_source_sender.cc b/device/serial/data_source_sender.cc
index e67a81e..4eaee75 100644
--- a/device/serial/data_source_sender.cc
+++ b/device/serial/data_source_sender.cc
@@ -52,10 +52,10 @@ class DataSourceSender::PendingSend::Buffer : public WritableBuffer {
   virtual ~Buffer();
 
   // WritableBuffer overrides.
-  virtual char* GetData() OVERRIDE;
-  virtual uint32_t GetSize() OVERRIDE;
-  virtual void Done(uint32_t bytes_written) OVERRIDE;
-  virtual void DoneWithError(uint32_t bytes_written, int32_t error) OVERRIDE;
+  virtual char* GetData() override;
+  virtual uint32_t GetSize() override;
+  virtual void Done(uint32_t bytes_written) override;
+  virtual void DoneWithError(uint32_t bytes_written, int32_t error) override;
 
  private:
   // The DataSourceSender whose data pipe we are providing a view.
diff --git a/device/serial/data_source_sender.h b/device/serial/data_source_sender.h
index 9bbabba..59782aa 100644
--- a/device/serial/data_source_sender.h
+++ b/device/serial/data_source_sender.h
@@ -41,10 +41,10 @@ class DataSourceSender : public base::RefCounted<DataSourceSender>,
   virtual ~DataSourceSender();
 
   // mojo::InterfaceImpl<serial::DataSourceSender> overrides.
-  virtual void Init(mojo::ScopedDataPipeProducerHandle handle) OVERRIDE;
-  virtual void Resume() OVERRIDE;
+  virtual void Init(mojo::ScopedDataPipeProducerHandle handle) override;
+  virtual void Resume() override;
   // Invoked in the event of a connection error. Calls DispatchFatalError().
-  virtual void OnConnectionError() OVERRIDE;
+  virtual void OnConnectionError() override;
 
   // Starts waiting for |handle_| to be ready for writes.
   void StartWaiting();
diff --git a/device/serial/data_source_unittest.cc b/device/serial/data_source_unittest.cc
index e185731..7e4d820 100644
--- a/device/serial/data_source_unittest.cc
+++ b/device/serial/data_source_unittest.cc
@@ -28,7 +28,7 @@ class DataSourceTest : public testing::Test {
   DataSourceTest()
       : error_(0), seen_connection_error_(false), expected_event_(EVENT_NONE) {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     message_loop_.reset(new base::MessageLoop);
     mojo::InterfacePtr<serial::DataSource> source_sender_handle;
     source_sender_ = mojo::WeakBindToProxy(
@@ -39,7 +39,7 @@ class DataSourceTest : public testing::Test {
     receiver_ = new DataReceiver(source_sender_handle.Pass(), 100, kFatalError);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     write_buffer_.reset();
     buffer_.reset();
     message_loop_.reset();
diff --git a/device/serial/serial_connection.h b/device/serial/serial_connection.h
index 807e173..c578a9d 100644
--- a/device/serial/serial_connection.h
+++ b/device/serial/serial_connection.h
@@ -27,15 +27,15 @@ class SerialConnection : public mojo::InterfaceImpl<serial::Connection> {
 
   // mojo::InterfaceImpl<serial::Connection> overrides.
   virtual void GetInfo(
-      const mojo::Callback<void(serial::ConnectionInfoPtr)>& callback) OVERRIDE;
+      const mojo::Callback<void(serial::ConnectionInfoPtr)>& callback) override;
   virtual void SetOptions(serial::ConnectionOptionsPtr options,
-                          const mojo::Callback<void(bool)>& callback) OVERRIDE;
+                          const mojo::Callback<void(bool)>& callback) override;
   virtual void SetControlSignals(
       serial::HostControlSignalsPtr signals,
-      const mojo::Callback<void(bool)>& callback) OVERRIDE;
+      const mojo::Callback<void(bool)>& callback) override;
   virtual void GetControlSignals(const mojo::Callback<
-      void(serial::DeviceControlSignalsPtr)>& callback) OVERRIDE;
-  virtual void Flush(const mojo::Callback<void(bool)>& callback) OVERRIDE;
+      void(serial::DeviceControlSignalsPtr)>& callback) override;
+  virtual void Flush(const mojo::Callback<void(bool)>& callback) override;
 
  private:
   void OnSendPipeReady(scoped_ptr<ReadOnlyBuffer> buffer);
diff --git a/device/serial/serial_connection_unittest.cc b/device/serial/serial_connection_unittest.cc
index ed4fc39..b18e95e 100644
--- a/device/serial/serial_connection_unittest.cc
+++ b/device/serial/serial_connection_unittest.cc
@@ -24,7 +24,7 @@ namespace device {
 namespace {
 
 class FakeSerialDeviceEnumerator : public SerialDeviceEnumerator {
-  virtual mojo::Array<serial::DeviceInfoPtr> GetDevices() OVERRIDE {
+  virtual mojo::Array<serial::DeviceInfoPtr> GetDevices() override {
     mojo::Array<serial::DeviceInfoPtr> devices(1);
     devices[0] = serial::DeviceInfo::New();
     devices[0]->path = "device";
@@ -62,7 +62,7 @@ class SerialConnectionTest : public testing::Test, public mojo::ErrorHandler {
         receive_error_(serial::RECEIVE_ERROR_NONE),
         expected_event_(EVENT_NONE) {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     message_loop_.reset(new base::MessageLoop);
     mojo::InterfacePtr<serial::SerialService> service;
     mojo::BindToProxy(
@@ -168,7 +168,7 @@ class SerialConnectionTest : public testing::Test, public mojo::ErrorHandler {
     EventReceived(EVENT_RECEIVE_ERROR);
   }
 
-  virtual void OnConnectionError() OVERRIDE {
+  virtual void OnConnectionError() override {
     EventReceived(EVENT_ERROR);
     FAIL() << "Connection error";
   }
diff --git a/device/serial/serial_device_enumerator_linux.h b/device/serial/serial_device_enumerator_linux.h
index 193475d..71eee69 100644
--- a/device/serial/serial_device_enumerator_linux.h
+++ b/device/serial/serial_device_enumerator_linux.h
@@ -19,7 +19,7 @@ class SerialDeviceEnumeratorLinux : public SerialDeviceEnumerator {
   virtual ~SerialDeviceEnumeratorLinux();
 
   // Implementation for SerialDeviceEnumerator.
-  virtual mojo::Array<serial::DeviceInfoPtr> GetDevices() OVERRIDE;
+  virtual mojo::Array<serial::DeviceInfoPtr> GetDevices() override;
 
  private:
   struct UdevDeleter {
diff --git a/device/serial/serial_device_enumerator_mac.h b/device/serial/serial_device_enumerator_mac.h
index cbbdb5f..ad4d674 100644
--- a/device/serial/serial_device_enumerator_mac.h
+++ b/device/serial/serial_device_enumerator_mac.h
@@ -16,7 +16,7 @@ class SerialDeviceEnumeratorMac : public SerialDeviceEnumerator {
   virtual ~SerialDeviceEnumeratorMac();
 
   // Implementation for SerialDeviceEnumerator.
-  virtual mojo::Array<serial::DeviceInfoPtr> GetDevices() OVERRIDE;
+  virtual mojo::Array<serial::DeviceInfoPtr> GetDevices() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SerialDeviceEnumeratorMac);
diff --git a/device/serial/serial_device_enumerator_win.h b/device/serial/serial_device_enumerator_win.h
index 4a5ac4d..b1a8f16 100644
--- a/device/serial/serial_device_enumerator_win.h
+++ b/device/serial/serial_device_enumerator_win.h
@@ -16,7 +16,7 @@ class SerialDeviceEnumeratorWin : public SerialDeviceEnumerator {
   virtual ~SerialDeviceEnumeratorWin();
 
   // Implementation for SerialDeviceEnumerator.
-  virtual mojo::Array<serial::DeviceInfoPtr> GetDevices() OVERRIDE;
+  virtual mojo::Array<serial::DeviceInfoPtr> GetDevices() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SerialDeviceEnumeratorWin);
diff --git a/device/serial/serial_io_handler_posix.h b/device/serial/serial_io_handler_posix.h
index a35842c..ef4bd37 100644
--- a/device/serial/serial_io_handler_posix.h
+++ b/device/serial/serial_io_handler_posix.h
@@ -14,17 +14,17 @@ class SerialIoHandlerPosix : public SerialIoHandler,
                              public base::MessageLoopForIO::Watcher {
  protected:
   // SerialIoHandler impl.
-  virtual void ReadImpl() OVERRIDE;
-  virtual void WriteImpl() OVERRIDE;
-  virtual void CancelReadImpl() OVERRIDE;
-  virtual void CancelWriteImpl() OVERRIDE;
-  virtual bool Flush() const OVERRIDE;
-  virtual serial::DeviceControlSignalsPtr GetControlSignals() const OVERRIDE;
+  virtual void ReadImpl() override;
+  virtual void WriteImpl() override;
+  virtual void CancelReadImpl() override;
+  virtual void CancelWriteImpl() override;
+  virtual bool Flush() const override;
+  virtual serial::DeviceControlSignalsPtr GetControlSignals() const override;
   virtual bool SetControlSignals(
-      const serial::HostControlSignals& control_signals) OVERRIDE;
-  virtual bool ConfigurePort(const serial::ConnectionOptions& options) OVERRIDE;
-  virtual serial::ConnectionInfoPtr GetPortInfo() const OVERRIDE;
-  virtual bool PostOpen() OVERRIDE;
+      const serial::HostControlSignals& control_signals) override;
+  virtual bool ConfigurePort(const serial::ConnectionOptions& options) override;
+  virtual serial::ConnectionInfoPtr GetPortInfo() const override;
+  virtual bool PostOpen() override;
 
  private:
   friend class SerialIoHandler;
@@ -34,8 +34,8 @@ class SerialIoHandlerPosix : public SerialIoHandler,
   virtual ~SerialIoHandlerPosix();
 
   // base::MessageLoopForIO::Watcher implementation.
-  virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE;
-  virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE;
+  virtual void OnFileCanWriteWithoutBlocking(int fd) override;
+  virtual void OnFileCanReadWithoutBlocking(int fd) override;
 
   void EnsureWatchingReads();
   void EnsureWatchingWrites();
diff --git a/device/serial/serial_io_handler_win.h b/device/serial/serial_io_handler_win.h
index a23c39a..ed45f5b 100644
--- a/device/serial/serial_io_handler_win.h
+++ b/device/serial/serial_io_handler_win.h
@@ -15,17 +15,17 @@ class SerialIoHandlerWin : public SerialIoHandler,
                            public base::MessageLoopForIO::IOHandler {
  protected:
   // SerialIoHandler implementation.
-  virtual void ReadImpl() OVERRIDE;
-  virtual void WriteImpl() OVERRIDE;
-  virtual void CancelReadImpl() OVERRIDE;
-  virtual void CancelWriteImpl() OVERRIDE;
-  virtual bool Flush() const OVERRIDE;
-  virtual serial::DeviceControlSignalsPtr GetControlSignals() const OVERRIDE;
+  virtual void ReadImpl() override;
+  virtual void WriteImpl() override;
+  virtual void CancelReadImpl() override;
+  virtual void CancelWriteImpl() override;
+  virtual bool Flush() const override;
+  virtual serial::DeviceControlSignalsPtr GetControlSignals() const override;
   virtual bool SetControlSignals(
-      const serial::HostControlSignals& control_signals) OVERRIDE;
-  virtual bool ConfigurePort(const serial::ConnectionOptions& options) OVERRIDE;
-  virtual serial::ConnectionInfoPtr GetPortInfo() const OVERRIDE;
-  virtual bool PostOpen() OVERRIDE;
+      const serial::HostControlSignals& control_signals) override;
+  virtual bool ConfigurePort(const serial::ConnectionOptions& options) override;
+  virtual serial::ConnectionInfoPtr GetPortInfo() const override;
+  virtual bool PostOpen() override;
 
  private:
   friend class SerialIoHandler;
@@ -37,7 +37,7 @@ class SerialIoHandlerWin : public SerialIoHandler,
   // base::MessageLoopForIO::IOHandler implementation.
   virtual void OnIOCompleted(base::MessageLoopForIO::IOContext* context,
                              DWORD bytes_transfered,
-                             DWORD error) OVERRIDE;
+                             DWORD error) override;
 
   // Context used for asynchronous WaitCommEvent calls.
   scoped_ptr<base::MessageLoopForIO::IOContext> comm_context_;
diff --git a/device/serial/serial_service_impl.h b/device/serial/serial_service_impl.h
index 8d78d54..b1c6612 100644
--- a/device/serial/serial_service_impl.h
+++ b/device/serial/serial_service_impl.h
@@ -32,13 +32,13 @@ class SerialServiceImpl : public mojo::InterfaceImpl<serial::SerialService> {
 
   // mojo::InterfaceImpl<SerialService> overrides.
   virtual void GetDevices(const mojo::Callback<
-      void(mojo::Array<serial::DeviceInfoPtr>)>& callback) OVERRIDE;
+      void(mojo::Array<serial::DeviceInfoPtr>)>& callback) override;
   virtual void Connect(
       const mojo::String& path,
       serial::ConnectionOptionsPtr options,
       mojo::InterfaceRequest<serial::Connection> connection_request,
       mojo::InterfaceRequest<serial::DataSink> sink,
-      mojo::InterfaceRequest<serial::DataSource> source) OVERRIDE;
+      mojo::InterfaceRequest<serial::DataSource> source) override;
 
  private:
   SerialDeviceEnumerator* GetDeviceEnumerator();
diff --git a/device/serial/serial_service_unittest.cc b/device/serial/serial_service_unittest.cc
index c24fa18..20ebe3a 100644
--- a/device/serial/serial_service_unittest.cc
+++ b/device/serial/serial_service_unittest.cc
@@ -17,7 +17,7 @@ namespace device {
 namespace {
 
 class FakeSerialDeviceEnumerator : public SerialDeviceEnumerator {
-  virtual mojo::Array<serial::DeviceInfoPtr> GetDevices() OVERRIDE {
+  virtual mojo::Array<serial::DeviceInfoPtr> GetDevices() override {
     mojo::Array<serial::DeviceInfoPtr> devices(1);
     devices[0] = serial::DeviceInfo::New();
     devices[0]->path = "device";
@@ -28,7 +28,7 @@ class FakeSerialDeviceEnumerator : public SerialDeviceEnumerator {
 class FailToOpenIoHandler : public TestSerialIoHandler {
  public:
   virtual void Open(const std::string& port,
-                    const OpenCompleteCallback& callback) OVERRIDE {
+                    const OpenCompleteCallback& callback) override {
     callback.Run(false);
   }
 
@@ -47,7 +47,7 @@ class SerialServiceTest : public testing::Test, public mojo::ErrorHandler {
     StopMessageLoop();
   }
 
-  virtual void OnConnectionError() OVERRIDE {
+  virtual void OnConnectionError() override {
     StopMessageLoop();
     EXPECT_TRUE(expecting_error_);
   }
diff --git a/device/serial/test_serial_io_handler.h b/device/serial/test_serial_io_handler.h
index af62b58..3633555 100644
--- a/device/serial/test_serial_io_handler.h
+++ b/device/serial/test_serial_io_handler.h
@@ -21,17 +21,17 @@ class TestSerialIoHandler : public SerialIoHandler {
 
   // SerialIoHandler overrides.
   virtual void Open(const std::string& port,
-                    const OpenCompleteCallback& callback) OVERRIDE;
-  virtual bool ConfigurePort(const serial::ConnectionOptions& options) OVERRIDE;
-  virtual void ReadImpl() OVERRIDE;
-  virtual void CancelReadImpl() OVERRIDE;
-  virtual void WriteImpl() OVERRIDE;
-  virtual void CancelWriteImpl() OVERRIDE;
-  virtual serial::DeviceControlSignalsPtr GetControlSignals() const OVERRIDE;
-  virtual serial::ConnectionInfoPtr GetPortInfo() const OVERRIDE;
-  virtual bool Flush() const OVERRIDE;
+                    const OpenCompleteCallback& callback) override;
+  virtual bool ConfigurePort(const serial::ConnectionOptions& options) override;
+  virtual void ReadImpl() override;
+  virtual void CancelReadImpl() override;
+  virtual void WriteImpl() override;
+  virtual void CancelWriteImpl() override;
+  virtual serial::DeviceControlSignalsPtr GetControlSignals() const override;
+  virtual serial::ConnectionInfoPtr GetPortInfo() const override;
+  virtual bool Flush() const override;
   virtual bool SetControlSignals(
-      const serial::HostControlSignals& signals) OVERRIDE;
+      const serial::HostControlSignals& signals) override;
 
   serial::ConnectionInfo* connection_info() { return &info_; }
   serial::DeviceControlSignals* device_control_signals() {