replace OVERRIDE and FINAL with override and final in ipc/

BUG=417463

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

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

30 files changed, 187 insertions, 187 deletions

diff --git a/ipc/ipc_channel_factory.cc b/ipc/ipc_channel_factory.cc
index 4cb1790..f553203 100644
--- a/ipc/ipc_channel_factory.cc
+++ b/ipc/ipc_channel_factory.cc
@@ -15,12 +15,12 @@ class PlatformChannelFactory : public ChannelFactory {
       : handle_(handle), mode_(mode) {
   }
 
-  virtual std::string GetName() const OVERRIDE {
+  virtual std::string GetName() const override {
     return handle_.name;
   }
 
   virtual scoped_ptr<Channel> BuildChannel(
-      Listener* listener) OVERRIDE {
+      Listener* listener) override {
     return Channel::Create(handle_, mode_, listener);
   }
 
diff --git a/ipc/ipc_channel_nacl.cc b/ipc/ipc_channel_nacl.cc
index 7cf7397..783ee26 100644
--- a/ipc/ipc_channel_nacl.cc
+++ b/ipc/ipc_channel_nacl.cc
@@ -80,7 +80,7 @@ class ChannelNacl::ReaderThreadRunner
 
   // DelegateSimpleThread implementation. Reads data from the pipe in a loop
   // until either we are told to quit or a read fails.
-  virtual void Run() OVERRIDE;
+  virtual void Run() override;
 
  private:
   int pipe_;
diff --git a/ipc/ipc_channel_nacl.h b/ipc/ipc_channel_nacl.h
index f7da4c3..9c1e80f 100644
--- a/ipc/ipc_channel_nacl.h
+++ b/ipc/ipc_channel_nacl.h
@@ -41,11 +41,11 @@ class ChannelNacl : public Channel,
   virtual ~ChannelNacl();
 
   // Channel implementation.
-  virtual base::ProcessId GetPeerPID() const OVERRIDE;
-  virtual base::ProcessId GetSelfPID() const OVERRIDE;
-  virtual bool Connect() OVERRIDE;
-  virtual void Close() OVERRIDE;
-  virtual bool Send(Message* message) OVERRIDE;
+  virtual base::ProcessId GetPeerPID() const override;
+  virtual base::ProcessId GetSelfPID() const override;
+  virtual bool Connect() override;
+  virtual void Close() override;
+  virtual bool Send(Message* message) override;
 
   // Posted to the main thread by ReaderThreadRunner.
   void DidRecvMsg(scoped_ptr<MessageContents> contents);
@@ -61,10 +61,10 @@ class ChannelNacl : public Channel,
   // ChannelReader implementation.
   virtual ReadState ReadData(char* buffer,
                              int buffer_len,
-                             int* bytes_read) OVERRIDE;
-  virtual bool WillDispatchInputMessage(Message* msg) OVERRIDE;
-  virtual bool DidEmptyInputBuffers() OVERRIDE;
-  virtual void HandleInternalMessage(const Message& msg) OVERRIDE;
+                             int* bytes_read) override;
+  virtual bool WillDispatchInputMessage(Message* msg) override;
+  virtual bool DidEmptyInputBuffers() override;
+  virtual void HandleInternalMessage(const Message& msg) override;
 
   Mode mode_;
   bool waiting_connect_;
diff --git a/ipc/ipc_channel_posix.h b/ipc/ipc_channel_posix.h
index 9d0ed8b..c6da141 100644
--- a/ipc/ipc_channel_posix.h
+++ b/ipc/ipc_channel_posix.h
@@ -59,13 +59,13 @@ class IPC_EXPORT ChannelPosix : public Channel,
   virtual ~ChannelPosix();
 
   // Channel implementation
-  virtual bool Connect() OVERRIDE;
-  virtual void Close() OVERRIDE;
-  virtual bool Send(Message* message) OVERRIDE;
-  virtual base::ProcessId GetPeerPID() const OVERRIDE;
-  virtual base::ProcessId GetSelfPID() const OVERRIDE;
-  virtual int GetClientFileDescriptor() const OVERRIDE;
-  virtual int TakeClientFileDescriptor() OVERRIDE;
+  virtual bool Connect() override;
+  virtual void Close() override;
+  virtual bool Send(Message* message) override;
+  virtual base::ProcessId GetPeerPID() const override;
+  virtual base::ProcessId GetSelfPID() const override;
+  virtual int GetClientFileDescriptor() const override;
+  virtual int TakeClientFileDescriptor() override;
 
   // Returns true if the channel supports listening for connections.
   bool AcceptsConnections() const;
@@ -104,10 +104,10 @@ class IPC_EXPORT ChannelPosix : public Channel,
   // ChannelReader implementation.
   virtual ReadState ReadData(char* buffer,
                              int buffer_len,
-                             int* bytes_read) OVERRIDE;
-  virtual bool WillDispatchInputMessage(Message* msg) OVERRIDE;
-  virtual bool DidEmptyInputBuffers() OVERRIDE;
-  virtual void HandleInternalMessage(const Message& msg) OVERRIDE;
+                             int* bytes_read) override;
+  virtual bool WillDispatchInputMessage(Message* msg) override;
+  virtual bool DidEmptyInputBuffers() override;
+  virtual void HandleInternalMessage(const Message& msg) override;
 
 #if defined(IPC_USES_READWRITE)
   // Reads the next message from the fd_pipe_ and appends them to the
@@ -129,8 +129,8 @@ class IPC_EXPORT ChannelPosix : public Channel,
   void ClearInputFDs();
 
   // MessageLoopForIO::Watcher implementation.
-  virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE;
-  virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE;
+  virtual void OnFileCanReadWithoutBlocking(int fd) override;
+  virtual void OnFileCanWriteWithoutBlocking(int fd) override;
 
   Mode mode_;
 
diff --git a/ipc/ipc_channel_posix_unittest.cc b/ipc/ipc_channel_posix_unittest.cc
index f32169e..b61b345 100644
--- a/ipc/ipc_channel_posix_unittest.cc
+++ b/ipc/ipc_channel_posix_unittest.cc
@@ -47,33 +47,33 @@ class IPCChannelPosixTestListener : public IPC::Listener {
 
   virtual ~IPCChannelPosixTestListener() {}
 
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE {
+  virtual bool OnMessageReceived(const IPC::Message& message) override {
     EXPECT_EQ(message.type(), kQuitMessage);
     status_ = MESSAGE_RECEIVED;
     QuitRunLoop();
     return true;
   }
 
-  virtual void OnChannelConnected(int32 peer_pid) OVERRIDE {
+  virtual void OnChannelConnected(int32 peer_pid) override {
     status_ = CONNECTED;
     if (!quit_only_on_message_) {
       QuitRunLoop();
     }
   }
 
-  virtual void OnChannelError() OVERRIDE {
+  virtual void OnChannelError() override {
     status_ = CHANNEL_ERROR;
     QuitRunLoop();
   }
 
-  virtual void OnChannelDenied() OVERRIDE {
+  virtual void OnChannelDenied() override {
     status_ = DENIED;
     if (!quit_only_on_message_) {
       QuitRunLoop();
     }
   }
 
-  virtual void OnChannelListenError() OVERRIDE {
+  virtual void OnChannelListenError() override {
     status_ = LISTEN_ERROR;
     if (!quit_only_on_message_) {
       QuitRunLoop();
diff --git a/ipc/ipc_channel_proxy.h b/ipc/ipc_channel_proxy.h
index 4731e18..00d5f42 100644
--- a/ipc/ipc_channel_proxy.h
+++ b/ipc/ipc_channel_proxy.h
@@ -98,7 +98,7 @@ class IPC_EXPORT ChannelProxy : public Sender, public base::NonThreadSafe {
 
   // Send a message asynchronously.  The message is routed to the background
   // thread where it is passed to the IPC::Channel's Send method.
-  virtual bool Send(Message* message) OVERRIDE;
+  virtual bool Send(Message* message) override;
 
   // Used to intercept messages as they are received on the background thread.
   //
@@ -155,9 +155,9 @@ class IPC_EXPORT ChannelProxy : public Sender, public base::NonThreadSafe {
     virtual ~Context();
 
     // IPC::Listener methods:
-    virtual bool OnMessageReceived(const Message& message) OVERRIDE;
-    virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
-    virtual void OnChannelError() OVERRIDE;
+    virtual bool OnMessageReceived(const Message& message) override;
+    virtual void OnChannelConnected(int32 peer_pid) override;
+    virtual void OnChannelError() override;
 
     // Like OnMessageReceived but doesn't try the filters.
     bool OnMessageReceivedNoFilter(const Message& message);
diff --git a/ipc/ipc_channel_proxy_unittest.cc b/ipc/ipc_channel_proxy_unittest.cc
index 81b65ec..9042f44 100644
--- a/ipc/ipc_channel_proxy_unittest.cc
+++ b/ipc/ipc_channel_proxy_unittest.cc
@@ -49,7 +49,7 @@ class QuitListener : public IPC::Listener {
   QuitListener() : bad_message_received_(false) {}
   virtual ~QuitListener() {}
 
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE {
+  virtual bool OnMessageReceived(const IPC::Message& message) override {
     IPC_BEGIN_MESSAGE_MAP(QuitListener, message)
       IPC_MESSAGE_HANDLER(WorkerMsg_Quit, OnQuit)
       IPC_MESSAGE_HANDLER(TestMsg_BadMessage, OnBadMessage)
@@ -57,7 +57,7 @@ class QuitListener : public IPC::Listener {
     return true;
   }
 
-  virtual void OnBadMessageReceived(const IPC::Message& message) OVERRIDE {
+  virtual void OnBadMessageReceived(const IPC::Message& message) override {
     bad_message_received_ = true;
   }
 
@@ -83,7 +83,7 @@ class ChannelReflectorListener : public IPC::Listener {
     channel_ = channel;
   }
 
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE {
+  virtual bool OnMessageReceived(const IPC::Message& message) override {
     IPC_BEGIN_MESSAGE_MAP(ChannelReflectorListener, message)
       IPC_MESSAGE_HANDLER(TestMsg_Bounce, OnTestBounce)
       IPC_MESSAGE_HANDLER(TestMsg_SendBadMessage, OnSendBadMessage)
@@ -143,24 +143,24 @@ class MessageCountFilter : public IPC::MessageFilter {
         last_filter_event_(NONE),
         message_filtering_enabled_(false) {}
 
-  virtual void OnFilterAdded(IPC::Sender* sender) OVERRIDE {
+  virtual void OnFilterAdded(IPC::Sender* sender) override {
     EXPECT_TRUE(sender);
     EXPECT_EQ(NONE, last_filter_event_);
     last_filter_event_ = FILTER_ADDED;
   }
 
-  virtual void OnChannelConnected(int32_t peer_pid) OVERRIDE {
+  virtual void OnChannelConnected(int32_t peer_pid) override {
     EXPECT_EQ(FILTER_ADDED, last_filter_event_);
     EXPECT_NE(static_cast<int32_t>(base::kNullProcessId), peer_pid);
     last_filter_event_ = CHANNEL_CONNECTED;
   }
 
-  virtual void OnChannelError() OVERRIDE {
+  virtual void OnChannelError() override {
     EXPECT_EQ(CHANNEL_CONNECTED, last_filter_event_);
     last_filter_event_ = CHANNEL_ERROR;
   }
 
-  virtual void OnChannelClosing() OVERRIDE {
+  virtual void OnChannelClosing() override {
     // We may or may not have gotten OnChannelError; if not, the last event has
     // to be OnChannelConnected.
     if (last_filter_event_ != CHANNEL_ERROR)
@@ -168,7 +168,7 @@ class MessageCountFilter : public IPC::MessageFilter {
     last_filter_event_ = CHANNEL_CLOSING;
   }
 
-  virtual void OnFilterRemoved() OVERRIDE {
+  virtual void OnFilterRemoved() override {
     // If the channel didn't get a chance to connect, we might see the
     // OnFilterRemoved event with no other events preceding it. We still want
     // OnFilterRemoved to be called to allow for deleting the Filter.
@@ -177,7 +177,7 @@ class MessageCountFilter : public IPC::MessageFilter {
     last_filter_event_ = FILTER_REMOVED;
   }
 
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE {
+  virtual bool OnMessageReceived(const IPC::Message& message) override {
     // We should always get the OnFilterAdded and OnChannelConnected events
     // prior to any messages.
     EXPECT_EQ(CHANNEL_CONNECTED, last_filter_event_);
@@ -204,7 +204,7 @@ class MessageCountFilter : public IPC::MessageFilter {
   }
 
   virtual bool GetSupportedMessageClasses(
-      std::vector<uint32>* supported_message_classes) const OVERRIDE {
+      std::vector<uint32>* supported_message_classes) const override {
     if (is_global_filter_)
       return false;
     supported_message_classes->push_back(supported_message_class_);
@@ -234,7 +234,7 @@ class IPCChannelProxyTest : public IPCTestBase {
   IPCChannelProxyTest() {}
   virtual ~IPCChannelProxyTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     IPCTestBase::SetUp();
 
     Init("ChannelProxyClient");
@@ -383,7 +383,7 @@ class IPCChannelBadMessageTest : public IPCTestBase {
   IPCChannelBadMessageTest() {}
   virtual ~IPCChannelBadMessageTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     IPCTestBase::SetUp();
 
     Init("ChannelProxyClient");
diff --git a/ipc/ipc_channel_unittest.cc b/ipc/ipc_channel_unittest.cc
index 1f85311..b9d0723 100644
--- a/ipc/ipc_channel_unittest.cc
+++ b/ipc/ipc_channel_unittest.cc
@@ -148,7 +148,7 @@ class ChannelListenerWithOnConnectedSend : public IPC::TestChannelListener {
   ChannelListenerWithOnConnectedSend() {}
   virtual ~ChannelListenerWithOnConnectedSend() {}
 
-  virtual void OnChannelConnected(int32 peer_pid) OVERRIDE {
+  virtual void OnChannelConnected(int32 peer_pid) override {
     SendNextMessage();
   }
 };
diff --git a/ipc/ipc_channel_win.h b/ipc/ipc_channel_win.h
index f708618..2f9fee2 100644
--- a/ipc/ipc_channel_win.h
+++ b/ipc/ipc_channel_win.h
@@ -32,11 +32,11 @@ class ChannelWin : public Channel,
   ~ChannelWin();
 
   // Channel implementation
-  virtual bool Connect() OVERRIDE;
-  virtual void Close() OVERRIDE;
-  virtual bool Send(Message* message) OVERRIDE;
-  virtual base::ProcessId GetPeerPID() const OVERRIDE;
-  virtual base::ProcessId GetSelfPID() const OVERRIDE;
+  virtual bool Connect() override;
+  virtual void Close() override;
+  virtual bool Send(Message* message) override;
+  virtual base::ProcessId GetPeerPID() const override;
+  virtual base::ProcessId GetSelfPID() const override;
 
   static bool IsNamedServerInitialized(const std::string& channel_id);
 
@@ -45,10 +45,10 @@ class ChannelWin : public Channel,
   // ChannelReader implementation.
   virtual ReadState ReadData(char* buffer,
                              int buffer_len,
-                             int* bytes_read) OVERRIDE;
-  virtual bool WillDispatchInputMessage(Message* msg) OVERRIDE;
-  bool DidEmptyInputBuffers() OVERRIDE;
-  virtual void HandleInternalMessage(const Message& msg) OVERRIDE;
+                             int* bytes_read) override;
+  virtual bool WillDispatchInputMessage(Message* msg) override;
+  bool DidEmptyInputBuffers() override;
+  virtual void HandleInternalMessage(const Message& msg) override;
 
   static const base::string16 PipeName(const std::string& channel_id,
                                        int32* secret);
diff --git a/ipc/ipc_forwarding_message_filter.h b/ipc/ipc_forwarding_message_filter.h
index 597fc60..474fbf4 100644
--- a/ipc/ipc_forwarding_message_filter.h
+++ b/ipc/ipc_forwarding_message_filter.h
@@ -45,7 +45,7 @@ class IPC_EXPORT ForwardingMessageFilter : public MessageFilter {
   void RemoveRoute(int routing_id);
 
   // MessageFilter methods:
-  virtual bool OnMessageReceived(const Message& message) OVERRIDE;
+  virtual bool OnMessageReceived(const Message& message) override;
 
  private:
   virtual ~ForwardingMessageFilter();
diff --git a/ipc/ipc_fuzzing_tests.cc b/ipc/ipc_fuzzing_tests.cc
index 4abcc4c..a85491c 100644
--- a/ipc/ipc_fuzzing_tests.cc
+++ b/ipc/ipc_fuzzing_tests.cc
@@ -135,7 +135,7 @@ class FuzzerServerListener : public SimpleListener {
  public:
   FuzzerServerListener() : message_count_(2), pending_messages_(0) {
   }
-  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE {
+  virtual bool OnMessageReceived(const IPC::Message& msg) override {
     if (msg.routing_id() == MSG_ROUTING_CONTROL) {
       ++pending_messages_;
       IPC_BEGIN_MESSAGE_MAP(FuzzerServerListener, msg)
@@ -199,7 +199,7 @@ class FuzzerClientListener : public SimpleListener {
   FuzzerClientListener() : last_msg_(NULL) {
   }
 
-  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE {
+  virtual bool OnMessageReceived(const IPC::Message& msg) override {
     last_msg_ = new IPC::Message(msg);
     base::MessageLoop::current()->Quit();
     return true;
diff --git a/ipc/ipc_perftest_support.cc b/ipc/ipc_perftest_support.cc
index b826420..e60de91 100644
--- a/ipc/ipc_perftest_support.cc
+++ b/ipc/ipc_perftest_support.cc
@@ -91,7 +91,7 @@ class ChannelReflectorListener : public Listener {
     channel_ = channel;
   }
 
-  virtual bool OnMessageReceived(const Message& message) OVERRIDE {
+  virtual bool OnMessageReceived(const Message& message) override {
     CHECK(channel_);
 
     PickleIterator iter(message);
@@ -160,7 +160,7 @@ class PerformanceChannelListener : public Listener {
     payload_ = std::string(msg_size_, 'a');
   }
 
-  virtual bool OnMessageReceived(const Message& message) OVERRIDE {
+  virtual bool OnMessageReceived(const Message& message) override {
     CHECK(sender_);
 
     PickleIterator iter(message);
diff --git a/ipc/ipc_send_fds_test.cc b/ipc/ipc_send_fds_test.cc
index 1df6be9..fcba77f 100644
--- a/ipc/ipc_send_fds_test.cc
+++ b/ipc/ipc_send_fds_test.cc
@@ -33,7 +33,7 @@ const char* kDevZeroPath = "/dev/zero";
 
 class MyChannelDescriptorListenerBase : public IPC::Listener {
  public:
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE {
+  virtual bool OnMessageReceived(const IPC::Message& message) override {
     PickleIterator iter(message);
 
     base::FileDescriptor descriptor;
@@ -60,12 +60,12 @@ class MyChannelDescriptorListener : public MyChannelDescriptorListenerBase {
     return num_fds_received_ == kNumFDsToSend;
   }
 
-  virtual void OnChannelError() OVERRIDE {
+  virtual void OnChannelError() override {
     base::MessageLoop::current()->Quit();
   }
 
  protected:
-  virtual void HandleFD(int fd) OVERRIDE {
+  virtual void HandleFD(int fd) override {
     // Check that we can read from the FD.
     char buf;
     ssize_t amt_read = read(fd, &buf, 1);
@@ -202,7 +202,7 @@ class MyCBListener : public MyChannelDescriptorListenerBase {
     }
 
  protected:
-  virtual void HandleFD(int fd) OVERRIDE {
+  virtual void HandleFD(int fd) override {
     cb_.Run(fd);
   }
  private:
diff --git a/ipc/ipc_sync_channel.h b/ipc/ipc_sync_channel.h
index 5bbd46c5..3f62d2f 100644
--- a/ipc/ipc_sync_channel.h
+++ b/ipc/ipc_sync_channel.h
@@ -93,7 +93,7 @@ class IPC_EXPORT SyncChannel : public ChannelProxy {
 
   virtual ~SyncChannel();
 
-  virtual bool Send(Message* message) OVERRIDE;
+  virtual bool Send(Message* message) override;
 
   // Sets the dispatch group for this channel, to only allow re-entrant dispatch
   // of messages to other channels in the same group.
@@ -174,13 +174,13 @@ class IPC_EXPORT SyncChannel : public ChannelProxy {
     // ChannelProxy methods that we override.
 
     // Called on the listener thread.
-    virtual void Clear() OVERRIDE;
+    virtual void Clear() override;
 
     // Called on the IPC thread.
-    virtual bool OnMessageReceived(const Message& msg) OVERRIDE;
-    virtual void OnChannelError() OVERRIDE;
-    virtual void OnChannelOpened() OVERRIDE;
-    virtual void OnChannelClosed() OVERRIDE;
+    virtual bool OnMessageReceived(const Message& msg) override;
+    virtual void OnChannelError() override;
+    virtual void OnChannelOpened() override;
+    virtual void OnChannelClosed() override;
 
     // Cancels all pending Send calls.
     void CancelPendingSends();
diff --git a/ipc/ipc_sync_channel_unittest.cc b/ipc/ipc_sync_channel_unittest.cc
index 05126b9..3560d5b 100644
--- a/ipc/ipc_sync_channel_unittest.cc
+++ b/ipc/ipc_sync_channel_unittest.cc
@@ -64,7 +64,7 @@ class Worker : public Listener, public Sender {
   }
   void AddRef() { }
   void Release() { }
-  virtual bool Send(Message* msg) OVERRIDE { return channel_->Send(msg); }
+  virtual bool Send(Message* msg) override { return channel_->Send(msg); }
   void WaitForChannelCreation() { channel_created_->Wait(); }
   void CloseChannel() {
     DCHECK(base::MessageLoop::current() == ListenerThread()->message_loop());
@@ -200,7 +200,7 @@ class Worker : public Listener, public Sender {
     listener_event->Signal();
   }
 
-  virtual bool OnMessageReceived(const Message& message) OVERRIDE {
+  virtual bool OnMessageReceived(const Message& message) override {
     IPC_BEGIN_MESSAGE_MAP(Worker, message)
      IPC_MESSAGE_HANDLER_DELAY_REPLY(SyncChannelTestMsg_Double, OnDoubleDelay)
      IPC_MESSAGE_HANDLER_DELAY_REPLY(SyncChannelTestMsg_AnswerToLife,
@@ -274,7 +274,7 @@ class SimpleServer : public Worker {
   explicit SimpleServer(bool pump_during_send)
       : Worker(Channel::MODE_SERVER, "simpler_server"),
         pump_during_send_(pump_during_send) { }
-  virtual void Run() OVERRIDE {
+  virtual void Run() override {
     SendAnswerToLife(pump_during_send_, true);
     Done();
   }
@@ -286,7 +286,7 @@ class SimpleClient : public Worker {
  public:
   SimpleClient() : Worker(Channel::MODE_CLIENT, "simple_client") { }
 
-  virtual void OnAnswer(int* answer) OVERRIDE {
+  virtual void OnAnswer(int* answer) override {
     *answer = 42;
     Done();
   }
@@ -316,12 +316,12 @@ class TwoStepServer : public Worker {
       : Worker(Channel::MODE_SERVER, "simpler_server"),
         create_pipe_now_(create_pipe_now) { }
 
-  virtual void Run() OVERRIDE {
+  virtual void Run() override {
     SendAnswerToLife(false, true);
     Done();
   }
 
-  virtual SyncChannel* CreateChannel() OVERRIDE {
+  virtual SyncChannel* CreateChannel() override {
     SyncChannel* channel =
         SyncChannel::Create(channel_name(), mode(), this,
                             ipc_thread().message_loop_proxy().get(),
@@ -339,12 +339,12 @@ class TwoStepClient : public Worker {
       : Worker(Channel::MODE_CLIENT, "simple_client"),
         create_pipe_now_(create_pipe_now) { }
 
-  virtual void OnAnswer(int* answer) OVERRIDE {
+  virtual void OnAnswer(int* answer) override {
     *answer = 42;
     Done();
   }
 
-  virtual SyncChannel* CreateChannel() OVERRIDE {
+  virtual SyncChannel* CreateChannel() override {
     SyncChannel* channel =
         SyncChannel::Create(channel_name(), mode(), this,
                             ipc_thread().message_loop_proxy().get(),
@@ -378,7 +378,7 @@ class DelayClient : public Worker {
  public:
   DelayClient() : Worker(Channel::MODE_CLIENT, "delay_client") { }
 
-  virtual void OnAnswerDelay(Message* reply_msg) OVERRIDE {
+  virtual void OnAnswerDelay(Message* reply_msg) override {
     SyncChannelTestMsg_AnswerToLife::WriteReplyParams(reply_msg, 42);
     Send(reply_msg);
     Done();
@@ -406,7 +406,7 @@ class NoHangServer : public Worker {
       : Worker(Channel::MODE_SERVER, "no_hang_server"),
         got_first_reply_(got_first_reply),
         pump_during_send_(pump_during_send) { }
-  virtual void Run() OVERRIDE {
+  virtual void Run() override {
     SendAnswerToLife(pump_during_send_, true);
     got_first_reply_->Signal();
 
@@ -424,7 +424,7 @@ class NoHangClient : public Worker {
     : Worker(Channel::MODE_CLIENT, "no_hang_client"),
       got_first_reply_(got_first_reply) { }
 
-  virtual void OnAnswerDelay(Message* reply_msg) OVERRIDE {
+  virtual void OnAnswerDelay(Message* reply_msg) override {
     // Use the DELAY_REPLY macro so that we can force the reply to be sent
     // before this function returns (when the channel will be reset).
     SyncChannelTestMsg_AnswerToLife::WriteReplyParams(reply_msg, 42);
@@ -459,7 +459,7 @@ class UnblockServer : public Worker {
     : Worker(Channel::MODE_SERVER, "unblock_server"),
       pump_during_send_(pump_during_send),
       delete_during_send_(delete_during_send) { }
-  virtual void Run() OVERRIDE {
+  virtual void Run() override {
     if (delete_during_send_) {
       // Use custom code since race conditions mean the answer may or may not be
       // available.
@@ -474,7 +474,7 @@ class UnblockServer : public Worker {
     Done();
   }
 
-  virtual void OnDoubleDelay(int in, Message* reply_msg) OVERRIDE {
+  virtual void OnDoubleDelay(int in, Message* reply_msg) override {
     SyncChannelTestMsg_Double::WriteReplyParams(reply_msg, in * 2);
     Send(reply_msg);
     if (delete_during_send_)
@@ -491,7 +491,7 @@ class UnblockClient : public Worker {
     : Worker(Channel::MODE_CLIENT, "unblock_client"),
       pump_during_send_(pump_during_send) { }
 
-  virtual void OnAnswer(int* answer) OVERRIDE {
+  virtual void OnAnswer(int* answer) override {
     SendDouble(pump_during_send_, true);
     *answer = 42;
     Done();
@@ -533,12 +533,12 @@ class RecursiveServer : public Worker {
       : Worker(Channel::MODE_SERVER, "recursive_server"),
         expected_send_result_(expected_send_result),
         pump_first_(pump_first), pump_second_(pump_second) {}
-  virtual void Run() OVERRIDE {
+  virtual void Run() override {
     SendDouble(pump_first_, expected_send_result_);
     Done();
   }
 
-  virtual void OnDouble(int in, int* out) OVERRIDE {
+  virtual void OnDouble(int in, int* out) override {
     *out = in * 2;
     SendAnswerToLife(pump_second_, expected_send_result_);
   }
@@ -552,7 +552,7 @@ class RecursiveClient : public Worker {
       : Worker(Channel::MODE_CLIENT, "recursive_client"),
         pump_during_send_(pump_during_send), close_channel_(close_channel) {}
 
-  virtual void OnDoubleDelay(int in, Message* reply_msg) OVERRIDE {
+  virtual void OnDoubleDelay(int in, Message* reply_msg) override {
     SendDouble(pump_during_send_, !close_channel_);
     if (close_channel_) {
       delete reply_msg;
@@ -563,7 +563,7 @@ class RecursiveClient : public Worker {
     Done();
   }
 
-  virtual void OnAnswerDelay(Message* reply_msg) OVERRIDE {
+  virtual void OnAnswerDelay(Message* reply_msg) override {
     if (close_channel_) {
       delete reply_msg;
       CloseChannel();
@@ -629,7 +629,7 @@ class MultipleServer1 : public Worker {
     : Worker("test_channel1", Channel::MODE_SERVER),
       pump_during_send_(pump_during_send) { }
 
-  virtual void Run() OVERRIDE {
+  virtual void Run() override {
     SendDouble(pump_during_send_, true);
     Done();
   }
@@ -645,7 +645,7 @@ class MultipleClient1 : public Worker {
       client1_msg_received_(client1_msg_received),
       client1_can_reply_(client1_can_reply) { }
 
-  virtual void OnDouble(int in, int* out) OVERRIDE {
+  virtual void OnDouble(int in, int* out) override {
     client1_msg_received_->Signal();
     *out = in * 2;
     client1_can_reply_->Wait();
@@ -660,7 +660,7 @@ class MultipleServer2 : public Worker {
  public:
   MultipleServer2() : Worker("test_channel2", Channel::MODE_SERVER) { }
 
-  virtual void OnAnswer(int* result) OVERRIDE {
+  virtual void OnAnswer(int* result) override {
     *result = 42;
     Done();
   }
@@ -676,7 +676,7 @@ class MultipleClient2 : public Worker {
       client1_can_reply_(client1_can_reply),
       pump_during_send_(pump_during_send) { }
 
-  virtual void Run() OVERRIDE {
+  virtual void Run() override {
     client1_msg_received_->Wait();
     SendAnswerToLife(pump_during_send_, true);
     client1_can_reply_->Signal();
@@ -746,7 +746,7 @@ class QueuedReplyServer : public Worker {
     Worker::OverrideThread(listener_thread);
   }
 
-  virtual void OnNestedTestMsg(Message* reply_msg) OVERRIDE {
+  virtual void OnNestedTestMsg(Message* reply_msg) override {
     VLOG(1) << __FUNCTION__ << " Sending reply: " << reply_text_;
     SyncChannelNestedTestMsg_String::WriteReplyParams(reply_msg, reply_text_);
     Send(reply_msg);
@@ -775,7 +775,7 @@ class QueuedReplyClient : public Worker {
     Worker::OverrideThread(listener_thread);
   }
 
-  virtual void Run() OVERRIDE {
+  virtual void Run() override {
     std::string response;
     SyncMessage* msg = new SyncChannelNestedTestMsg_String(&response);
     if (pump_during_send_)
@@ -848,7 +848,7 @@ class ChattyClient : public Worker {
   ChattyClient() :
       Worker(Channel::MODE_CLIENT, "chatty_client") { }
 
-  virtual void OnAnswer(int* answer) OVERRIDE {
+  virtual void OnAnswer(int* answer) override {
     // The PostMessage limit is 10k.  Send 20% more than that.
     const int kMessageLimit = 10000;
     const int kMessagesToSend = kMessageLimit * 120 / 100;
@@ -895,7 +895,7 @@ class DoneEventRaceServer : public Worker {
   DoneEventRaceServer()
       : Worker(Channel::MODE_SERVER, "done_event_race_server") { }
 
-  virtual void Run() OVERRIDE {
+  virtual void Run() override {
     base::MessageLoop::current()->PostTask(FROM_HERE,
                                            base::Bind(&NestedCallback, this));
     base::MessageLoop::current()->PostDelayedTask(
@@ -934,7 +934,7 @@ class TestSyncMessageFilter : public SyncMessageFilter {
         message_loop_(message_loop) {
   }
 
-  virtual void OnFilterAdded(Sender* sender) OVERRIDE {
+  virtual void OnFilterAdded(Sender* sender) override {
     SyncMessageFilter::OnFilterAdded(sender);
     message_loop_->PostTask(
         FROM_HERE,
@@ -969,7 +969,7 @@ class SyncMessageFilterServer : public Worker {
                                         thread_.message_loop_proxy());
   }
 
-  virtual void Run() OVERRIDE {
+  virtual void Run() override {
     channel()->AddFilter(filter_.get());
   }
 
@@ -998,12 +998,12 @@ class ServerSendAfterClose : public Worker {
   }
 
  private:
-  virtual void Run() OVERRIDE {
+  virtual void Run() override {
     CloseChannel();
     Done();
   }
 
-  virtual bool Send(Message* msg) OVERRIDE {
+  virtual bool Send(Message* msg) override {
     send_result_ = Worker::Send(msg);
     Done();
     return send_result_;
@@ -1065,7 +1065,7 @@ class RestrictedDispatchServer : public Worker {
   base::Thread* ListenerThread() { return Worker::ListenerThread(); }
 
  private:
-  virtual bool OnMessageReceived(const Message& message) OVERRIDE {
+  virtual bool OnMessageReceived(const Message& message) override {
     IPC_BEGIN_MESSAGE_MAP(RestrictedDispatchServer, message)
      IPC_MESSAGE_HANDLER(SyncChannelTestMsg_NoArgs, OnNoArgs)
      IPC_MESSAGE_HANDLER(SyncChannelTestMsg_PingTTL, OnPingTTL)
@@ -1098,7 +1098,7 @@ class NonRestrictedDispatchServer : public Worker {
   }
 
  private:
-  virtual bool OnMessageReceived(const Message& message) OVERRIDE {
+  virtual bool OnMessageReceived(const Message& message) override {
     IPC_BEGIN_MESSAGE_MAP(NonRestrictedDispatchServer, message)
      IPC_MESSAGE_HANDLER(SyncChannelTestMsg_NoArgs, OnNoArgs)
      IPC_MESSAGE_HANDLER(SyncChannelTestMsg_Done, Done)
@@ -1123,7 +1123,7 @@ class RestrictedDispatchClient : public Worker {
         success_(success),
         sent_ping_event_(sent_ping_event) {}
 
-  virtual void Run() OVERRIDE {
+  virtual void Run() override {
     // Incoming messages from our channel should only be dispatched when we
     // send a message on that same channel.
     channel()->SetRestrictDispatchChannelGroup(1);
@@ -1187,7 +1187,7 @@ class RestrictedDispatchClient : public Worker {
   }
 
  private:
-  virtual bool OnMessageReceived(const Message& message) OVERRIDE {
+  virtual bool OnMessageReceived(const Message& message) override {
     IPC_BEGIN_MESSAGE_MAP(RestrictedDispatchClient, message)
      IPC_MESSAGE_HANDLER(SyncChannelTestMsg_Ping, OnPing)
      IPC_MESSAGE_HANDLER_DELAY_REPLY(SyncChannelTestMsg_PingTTL, OnPingTTL)
@@ -1281,7 +1281,7 @@ class RestrictedDispatchDeadlockServer : public Worker {
     SendMessageToClient();
   }
 
-  virtual void Run() OVERRIDE {
+  virtual void Run() override {
     channel()->SetRestrictDispatchChannelGroup(1);
     server_ready_event_->Signal();
   }
@@ -1289,7 +1289,7 @@ class RestrictedDispatchDeadlockServer : public Worker {
   base::Thread* ListenerThread() { return Worker::ListenerThread(); }
 
  private:
-  virtual bool OnMessageReceived(const Message& message) OVERRIDE {
+  virtual bool OnMessageReceived(const Message& message) override {
     IPC_BEGIN_MESSAGE_MAP(RestrictedDispatchDeadlockServer, message)
      IPC_MESSAGE_HANDLER(SyncChannelTestMsg_NoArgs, OnNoArgs)
      IPC_MESSAGE_HANDLER(SyncChannelTestMsg_Done, Done)
@@ -1329,7 +1329,7 @@ class RestrictedDispatchDeadlockClient2 : public Worker {
         received_noarg_reply_(false),
         done_issued_(false) {}
 
-  virtual void Run() OVERRIDE {
+  virtual void Run() override {
     server_ready_event_->Wait();
   }
 
@@ -1347,7 +1347,7 @@ class RestrictedDispatchDeadlockClient2 : public Worker {
 
   base::Thread* ListenerThread() { return Worker::ListenerThread(); }
  private:
-  virtual bool OnMessageReceived(const Message& message) OVERRIDE {
+  virtual bool OnMessageReceived(const Message& message) override {
     IPC_BEGIN_MESSAGE_MAP(RestrictedDispatchDeadlockClient2, message)
      IPC_MESSAGE_HANDLER(SyncChannelTestMsg_NoArgs, OnNoArgs)
     IPC_END_MESSAGE_MAP()
@@ -1390,7 +1390,7 @@ class RestrictedDispatchDeadlockClient1 : public Worker {
         received_noarg_reply_(false),
         done_issued_(false) {}
 
-  virtual void Run() OVERRIDE {
+  virtual void Run() override {
     server_ready_event_->Wait();
     server_->ListenerThread()->message_loop()->PostTask(
         FROM_HERE,
@@ -1410,7 +1410,7 @@ class RestrictedDispatchDeadlockClient1 : public Worker {
   }
 
  private:
-  virtual bool OnMessageReceived(const Message& message) OVERRIDE {
+  virtual bool OnMessageReceived(const Message& message) override {
     IPC_BEGIN_MESSAGE_MAP(RestrictedDispatchDeadlockClient1, message)
      IPC_MESSAGE_HANDLER(SyncChannelTestMsg_NoArgs, OnNoArgs)
     IPC_END_MESSAGE_MAP()
@@ -1523,7 +1523,7 @@ class RestrictedDispatchPipeWorker : public Worker {
     Done();
   }
 
-  virtual void Run() OVERRIDE {
+  virtual void Run() override {
     channel()->SetRestrictDispatchChannelGroup(group_);
     if (is_first())
       event1_->Signal();
@@ -1556,7 +1556,7 @@ class RestrictedDispatchPipeWorker : public Worker {
   bool is_first() { return !!success_; }
 
  private:
-  virtual bool OnMessageReceived(const Message& message) OVERRIDE {
+  virtual bool OnMessageReceived(const Message& message) override {
     IPC_BEGIN_MESSAGE_MAP(RestrictedDispatchPipeWorker, message)
      IPC_MESSAGE_HANDLER(SyncChannelTestMsg_PingTTL, OnPingTTL)
      IPC_MESSAGE_HANDLER(SyncChannelTestMsg_Done, OnDone)
@@ -1607,7 +1607,7 @@ class ReentrantReplyServer1 : public Worker {
       : Worker("reentrant_reply1", Channel::MODE_SERVER),
         server_ready_(server_ready) { }
 
-  virtual void Run() OVERRIDE {
+  virtual void Run() override {
     server2_channel_ =
         SyncChannel::Create("reentrant_reply2",
                             IPC::Channel::MODE_CLIENT,
@@ -1623,7 +1623,7 @@ class ReentrantReplyServer1 : public Worker {
   }
 
  private:
-  virtual bool OnMessageReceived(const Message& message) OVERRIDE {
+  virtual bool OnMessageReceived(const Message& message) override {
     IPC_BEGIN_MESSAGE_MAP(ReentrantReplyServer1, message)
      IPC_MESSAGE_HANDLER(SyncChannelTestMsg_Reentrant2, OnReentrant2)
      IPC_REPLY_HANDLER(OnReply)
@@ -1653,7 +1653,7 @@ class ReentrantReplyServer2 : public Worker {
         reply_(NULL) { }
 
  private:
-  virtual bool OnMessageReceived(const Message& message) OVERRIDE {
+  virtual bool OnMessageReceived(const Message& message) override {
     IPC_BEGIN_MESSAGE_MAP(ReentrantReplyServer2, message)
      IPC_MESSAGE_HANDLER_DELAY_REPLY(
          SyncChannelTestMsg_Reentrant1, OnReentrant1)
@@ -1685,7 +1685,7 @@ class ReentrantReplyClient : public Worker {
       : Worker("reentrant_reply1", Channel::MODE_CLIENT),
         server_ready_(server_ready) { }
 
-  virtual void Run() OVERRIDE {
+  virtual void Run() override {
     server_ready_->Wait();
     Send(new SyncChannelTestMsg_Reentrant2());
     Done();
@@ -1718,7 +1718,7 @@ class VerifiedServer : public Worker {
     Worker::OverrideThread(listener_thread);
   }
 
-  virtual void OnNestedTestMsg(Message* reply_msg) OVERRIDE {
+  virtual void OnNestedTestMsg(Message* reply_msg) override {
     VLOG(1) << __FUNCTION__ << " Sending reply: " << reply_text_;
     SyncChannelNestedTestMsg_String::WriteReplyParams(reply_msg, reply_text_);
     Send(reply_msg);
@@ -1740,7 +1740,7 @@ class VerifiedClient : public Worker {
     Worker::OverrideThread(listener_thread);
   }
 
-  virtual void Run() OVERRIDE {
+  virtual void Run() override {
     std::string response;
     SyncMessage* msg = new SyncChannelNestedTestMsg_String(&response);
     bool result = Send(msg);
diff --git a/ipc/ipc_sync_message_filter.h b/ipc/ipc_sync_message_filter.h
index 933a95e..015cbf8 100644
--- a/ipc/ipc_sync_message_filter.h
+++ b/ipc/ipc_sync_message_filter.h
@@ -31,13 +31,13 @@ class IPC_EXPORT SyncMessageFilter : public MessageFilter, public Sender {
   explicit SyncMessageFilter(base::WaitableEvent* shutdown_event);
 
   // MessageSender implementation.
-  virtual bool Send(Message* message) OVERRIDE;
+  virtual bool Send(Message* message) override;
 
   // MessageFilter implementation.
-  virtual void OnFilterAdded(Sender* sender) OVERRIDE;
-  virtual void OnChannelError() OVERRIDE;
-  virtual void OnChannelClosing() OVERRIDE;
-  virtual bool OnMessageReceived(const Message& message) OVERRIDE;
+  virtual void OnFilterAdded(Sender* sender) override;
+  virtual void OnChannelError() override;
+  virtual void OnChannelClosing() override;
+  virtual bool OnMessageReceived(const Message& message) override;
 
  protected:
   virtual ~SyncMessageFilter();
diff --git a/ipc/ipc_test_base.h b/ipc/ipc_test_base.h
index 65af35e..89d53db5 100644
--- a/ipc/ipc_test_base.h
+++ b/ipc/ipc_test_base.h
@@ -34,7 +34,7 @@ class IPCTestBase : public base::MultiProcessTest {
   IPCTestBase();
   virtual ~IPCTestBase();
 
-  virtual void TearDown() OVERRIDE;
+  virtual void TearDown() override;
 
   // Initializes the test to use the given client and creates an IO message loop
   // on the current thread.
diff --git a/ipc/ipc_test_channel_listener.h b/ipc/ipc_test_channel_listener.h
index 047e15d..228cbf7 100644
--- a/ipc/ipc_test_channel_listener.h
+++ b/ipc/ipc_test_channel_listener.h
@@ -22,8 +22,8 @@ class TestChannelListener : public Listener {
   TestChannelListener() : sender_(NULL), messages_left_(50) {}
   virtual ~TestChannelListener() {}
 
-  virtual bool OnMessageReceived(const Message& message) OVERRIDE;
-  virtual void OnChannelError() OVERRIDE;
+  virtual bool OnMessageReceived(const Message& message) override;
+  virtual void OnChannelError() override;
 
   void Init(Sender* s) {
     sender_ = s;
diff --git a/ipc/ipc_test_sink.h b/ipc/ipc_test_sink.h
index a09ceba..8154552 100644
--- a/ipc/ipc_test_sink.h
+++ b/ipc/ipc_test_sink.h
@@ -77,15 +77,15 @@ class TestSink : public Channel {
 
   // Interface in IPC::Channel. This copies the message to the sink and then
   // deletes it.
-  virtual bool Send(IPC::Message* message) OVERRIDE;
-  virtual bool Connect() OVERRIDE WARN_UNUSED_RESULT;
-  virtual void Close() OVERRIDE;
-  virtual base::ProcessId GetPeerPID() const OVERRIDE;
-  virtual base::ProcessId GetSelfPID() const OVERRIDE;
+  virtual bool Send(IPC::Message* message) override;
+  virtual bool Connect() override WARN_UNUSED_RESULT;
+  virtual void Close() override;
+  virtual base::ProcessId GetPeerPID() const override;
+  virtual base::ProcessId GetSelfPID() const override;
 
 #if defined(OS_POSIX) && !defined(OS_NACL)
-  virtual int GetClientFileDescriptor() const OVERRIDE;
-  virtual int TakeClientFileDescriptor() OVERRIDE;
+  virtual int GetClientFileDescriptor() const override;
+  virtual int TakeClientFileDescriptor() override;
 #endif  // defined(OS_POSIX) && !defined(OS_NACL)
 
   // Used by the source of the messages to send the message to the sink. This
diff --git a/ipc/mojo/ipc_channel_mojo.cc b/ipc/mojo/ipc_channel_mojo.cc
index d3a9f79..791a970 100644
--- a/ipc/mojo/ipc_channel_mojo.cc
+++ b/ipc/mojo/ipc_channel_mojo.cc
@@ -27,11 +27,11 @@ class MojoChannelFactory : public ChannelFactory {
                      Channel::Mode mode)
       : delegate_(delegate), channel_handle_(channel_handle), mode_(mode) {}
 
-  virtual std::string GetName() const OVERRIDE {
+  virtual std::string GetName() const override {
     return channel_handle_.name;
   }
 
-  virtual scoped_ptr<Channel> BuildChannel(Listener* listener) OVERRIDE {
+  virtual scoped_ptr<Channel> BuildChannel(Listener* listener) override {
     return ChannelMojo::Create(delegate_, channel_handle_, mode_, listener)
         .PassAs<Channel>();
   }
diff --git a/ipc/mojo/ipc_channel_mojo.h b/ipc/mojo/ipc_channel_mojo.h
index 5867c08..696d744 100644
--- a/ipc/mojo/ipc_channel_mojo.h
+++ b/ipc/mojo/ipc_channel_mojo.h
@@ -90,15 +90,15 @@ class IPC_MOJO_EXPORT ChannelMojo : public Channel,
   void OnClientLaunched(base::ProcessHandle handle);
 
   // Channel implementation
-  virtual bool Connect() OVERRIDE;
-  virtual void Close() OVERRIDE;
-  virtual bool Send(Message* message) OVERRIDE;
-  virtual base::ProcessId GetPeerPID() const OVERRIDE;
-  virtual base::ProcessId GetSelfPID() const OVERRIDE;
+  virtual bool Connect() override;
+  virtual void Close() override;
+  virtual bool Send(Message* message) override;
+  virtual base::ProcessId GetPeerPID() const override;
+  virtual base::ProcessId GetSelfPID() const override;
 
 #if defined(OS_POSIX) && !defined(OS_NACL)
-  virtual int GetClientFileDescriptor() const OVERRIDE;
-  virtual int TakeClientFileDescriptor() OVERRIDE;
+  virtual int GetClientFileDescriptor() const override;
+  virtual int TakeClientFileDescriptor() override;
 
   // These access protected API of IPC::Message, which has ChannelMojo
   // as a friend class.
@@ -112,8 +112,8 @@ class IPC_MOJO_EXPORT ChannelMojo : public Channel,
 
   // MojoBootstrapDelegate implementation
   virtual void OnPipeAvailable(
-      mojo::embedder::ScopedPlatformHandle handle) OVERRIDE;
-  virtual void OnBootstrapError() OVERRIDE;
+      mojo::embedder::ScopedPlatformHandle handle) override;
+  virtual void OnBootstrapError() override;
 
   // Called from MessagePipeReader implementations
   void OnMessageReceived(Message& message);
diff --git a/ipc/mojo/ipc_channel_mojo_host.cc b/ipc/mojo/ipc_channel_mojo_host.cc
index 87290ce..efe2a2c 100644
--- a/ipc/mojo/ipc_channel_mojo_host.cc
+++ b/ipc/mojo/ipc_channel_mojo_host.cc
@@ -20,9 +20,9 @@ class ChannelMojoHost::ChannelDelegate : public ChannelMojo::Delegate {
   virtual ~ChannelDelegate();
 
   // ChannelMojo::Delegate
-  virtual base::WeakPtr<Delegate> ToWeakPtr() OVERRIDE;
-  virtual void OnChannelCreated(base::WeakPtr<ChannelMojo> channel) OVERRIDE;
-  virtual scoped_refptr<base::TaskRunner> GetIOTaskRunner() OVERRIDE;
+  virtual base::WeakPtr<Delegate> ToWeakPtr() override;
+  virtual void OnChannelCreated(base::WeakPtr<ChannelMojo> channel) override;
+  virtual scoped_refptr<base::TaskRunner> GetIOTaskRunner() override;
 
   // Returns an weak ptr of ChannelDelegate instead of Delegate
   base::WeakPtr<ChannelDelegate> GetWeakPtr();
diff --git a/ipc/mojo/ipc_channel_mojo_readers.h b/ipc/mojo/ipc_channel_mojo_readers.h
index 13ddead..fae62ad 100644
--- a/ipc/mojo/ipc_channel_mojo_readers.h
+++ b/ipc/mojo/ipc_channel_mojo_readers.h
@@ -33,9 +33,9 @@ class MessageReader : public MessagePipeReader {
   bool Send(scoped_ptr<Message> message);
 
   // MessagePipeReader implementation
-  virtual void OnMessageReceived() OVERRIDE;
-  virtual void OnPipeClosed() OVERRIDE;
-  virtual void OnPipeError(MojoResult error) OVERRIDE;
+  virtual void OnMessageReceived() override;
+  virtual void OnPipeClosed() override;
+  virtual void OnPipeError(MojoResult error) override;
 
  private:
   ChannelMojo* owner_;
@@ -52,8 +52,8 @@ class ControlReader : public MessagePipeReader {
   virtual bool Connect();
 
   // MessagePipeReader implementation
-  virtual void OnPipeClosed() OVERRIDE;
-  virtual void OnPipeError(MojoResult error) OVERRIDE;
+  virtual void OnPipeClosed() override;
+  virtual void OnPipeError(MojoResult error) override;
 
  protected:
   ChannelMojo* owner_;
@@ -68,10 +68,10 @@ class ServerControlReader : public ControlReader {
   virtual ~ServerControlReader();
 
   // ControlReader override
-  virtual bool Connect() OVERRIDE;
+  virtual bool Connect() override;
 
   // MessagePipeReader implementation
-  virtual void OnMessageReceived() OVERRIDE;
+  virtual void OnMessageReceived() override;
 
  private:
   MojoResult SendHelloRequest();
@@ -88,7 +88,7 @@ class ClientControlReader : public ControlReader {
   ClientControlReader(mojo::ScopedMessagePipeHandle pipe, ChannelMojo* owner);
 
   // MessagePipeReader implementation
-  virtual void OnMessageReceived() OVERRIDE;
+  virtual void OnMessageReceived() override;
 
  private:
   MojoResult RespondHelloRequest(MojoHandle message_channel);
diff --git a/ipc/mojo/ipc_channel_mojo_unittest.cc b/ipc/mojo/ipc_channel_mojo_unittest.cc
index 39224a0..c66fc91 100644
--- a/ipc/mojo/ipc_channel_mojo_unittest.cc
+++ b/ipc/mojo/ipc_channel_mojo_unittest.cc
@@ -29,7 +29,7 @@ class ListenerThatExpectsOK : public IPC::Listener {
 
   virtual ~ListenerThatExpectsOK() {}
 
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE {
+  virtual bool OnMessageReceived(const IPC::Message& message) override {
     PickleIterator iter(message);
     std::string should_be_ok;
     EXPECT_TRUE(iter.ReadString(&should_be_ok));
@@ -39,7 +39,7 @@ class ListenerThatExpectsOK : public IPC::Listener {
     return true;
   }
 
-  virtual void OnChannelError() OVERRIDE {
+  virtual void OnChannelError() override {
     // The connection should be healthy while the listener is waiting
     // message.  An error can occur after that because the peer
     // process dies.
@@ -81,13 +81,13 @@ class IPCChannelMojoTest : public IPCTestBase {
  protected:
   virtual scoped_ptr<IPC::ChannelFactory> CreateChannelFactory(
       const IPC::ChannelHandle& handle,
-      base::TaskRunner* runner) OVERRIDE {
+      base::TaskRunner* runner) override {
     host_.reset(new IPC::ChannelMojoHost(task_runner()));
     return IPC::ChannelMojo::CreateServerFactory(host_->channel_delegate(),
                                                  handle);
   }
 
-  virtual bool DidStartClient() OVERRIDE {
+  virtual bool DidStartClient() override {
     bool ok = IPCTestBase::DidStartClient();
     DCHECK(ok);
     host_->OnClientLaunched(client_process());
@@ -106,7 +106,7 @@ class TestChannelListenerWithExtraExpectations
       : is_connected_called_(false) {
   }
 
-  virtual void OnChannelConnected(int32 peer_pid) OVERRIDE {
+  virtual void OnChannelConnected(int32 peer_pid) override {
     IPC::TestChannelListener::OnChannelConnected(peer_pid);
     EXPECT_TRUE(base::kNullProcessId != peer_pid);
     is_connected_called_ = true;
@@ -165,15 +165,15 @@ class ListenerExpectingErrors : public IPC::Listener {
       : has_error_(false) {
   }
 
-  virtual void OnChannelConnected(int32 peer_pid) OVERRIDE {
+  virtual void OnChannelConnected(int32 peer_pid) override {
     base::MessageLoop::current()->Quit();
   }
 
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE {
+  virtual bool OnMessageReceived(const IPC::Message& message) override {
     return true;
   }
 
-  virtual void OnChannelError() OVERRIDE {
+  virtual void OnChannelError() override {
     has_error_ = true;
     base::MessageLoop::current()->Quit();
   }
@@ -189,13 +189,13 @@ class IPCChannelMojoErrorTest : public IPCTestBase {
  protected:
   virtual scoped_ptr<IPC::ChannelFactory> CreateChannelFactory(
       const IPC::ChannelHandle& handle,
-      base::TaskRunner* runner) OVERRIDE {
+      base::TaskRunner* runner) override {
     host_.reset(new IPC::ChannelMojoHost(task_runner()));
     return IPC::ChannelMojo::CreateServerFactory(host_->channel_delegate(),
                                                  handle);
   }
 
-  virtual bool DidStartClient() OVERRIDE {
+  virtual bool DidStartClient() override {
     bool ok = IPCTestBase::DidStartClient();
     DCHECK(ok);
     host_->OnClientLaunched(client_process());
@@ -211,11 +211,11 @@ class ListenerThatQuits : public IPC::Listener {
   ListenerThatQuits() {
   }
 
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE {
+  virtual bool OnMessageReceived(const IPC::Message& message) override {
     return true;
   }
 
-  virtual void OnChannelConnected(int32 peer_pid) OVERRIDE {
+  virtual void OnChannelConnected(int32 peer_pid) override {
     base::MessageLoop::current()->Quit();
   }
 };
@@ -268,7 +268,7 @@ class ListenerThatExpectsFile : public IPC::Listener {
 
   virtual ~ListenerThatExpectsFile() {}
 
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE {
+  virtual bool OnMessageReceived(const IPC::Message& message) override {
     PickleIterator iter(message);
 
     base::ScopedFD fd;
@@ -282,7 +282,7 @@ class ListenerThatExpectsFile : public IPC::Listener {
     return true;
   }
 
-  virtual void OnChannelError() OVERRIDE {
+  virtual void OnChannelError() override {
     NOTREACHED();
   }
 
diff --git a/ipc/mojo/ipc_mojo_bootstrap.cc b/ipc/mojo/ipc_mojo_bootstrap.cc
index 1b50b3f..f45a18e 100644
--- a/ipc/mojo/ipc_mojo_bootstrap.cc
+++ b/ipc/mojo/ipc_mojo_bootstrap.cc
@@ -20,15 +20,15 @@ class IPC_MOJO_EXPORT MojoServerBootstrap : public MojoBootstrap {
  public:
   MojoServerBootstrap();
 
-  virtual void OnClientLaunched(base::ProcessHandle process) OVERRIDE;
+  virtual void OnClientLaunched(base::ProcessHandle process) override;
 
  private:
   void SendClientPipe();
   void SendClientPipeIfReady();
 
   // Listener implementations
-  virtual bool OnMessageReceived(const Message& message) OVERRIDE;
-  virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
+  virtual bool OnMessageReceived(const Message& message) override;
+  virtual void OnChannelConnected(int32 peer_pid) override;
 
   mojo::embedder::ScopedPlatformHandle server_pipe_;
   base::ProcessHandle client_process_;
@@ -103,12 +103,12 @@ class IPC_MOJO_EXPORT MojoClientBootstrap : public MojoBootstrap {
  public:
   MojoClientBootstrap();
 
-  virtual void OnClientLaunched(base::ProcessHandle process) OVERRIDE;
+  virtual void OnClientLaunched(base::ProcessHandle process) override;
 
  private:
   // Listener implementations
-  virtual bool OnMessageReceived(const Message& message) OVERRIDE;
-  virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
+  virtual bool OnMessageReceived(const Message& message) override;
+  virtual void OnChannelConnected(int32 peer_pid) override;
 
   DISALLOW_COPY_AND_ASSIGN(MojoClientBootstrap);
 };
diff --git a/ipc/mojo/ipc_mojo_bootstrap.h b/ipc/mojo/ipc_mojo_bootstrap.h
index 4d9e471..f0e4188 100644
--- a/ipc/mojo/ipc_mojo_bootstrap.h
+++ b/ipc/mojo/ipc_mojo_bootstrap.h
@@ -67,8 +67,8 @@ class IPC_MOJO_EXPORT MojoBootstrap : public Listener {
   void Init(scoped_ptr<Channel> channel, Delegate* delegate);
 
   // Listener implementations
-  virtual void OnBadMessageReceived(const Message& message) OVERRIDE;
-  virtual void OnChannelError() OVERRIDE;
+  virtual void OnBadMessageReceived(const Message& message) override;
+  virtual void OnChannelError() override;
 
   scoped_ptr<Channel> channel_;
   Delegate* delegate_;
diff --git a/ipc/mojo/ipc_mojo_bootstrap_unittest.cc b/ipc/mojo/ipc_mojo_bootstrap_unittest.cc
index 207c060..8bffd88 100644
--- a/ipc/mojo/ipc_mojo_bootstrap_unittest.cc
+++ b/ipc/mojo/ipc_mojo_bootstrap_unittest.cc
@@ -24,8 +24,8 @@ class TestingDelegate : public IPC::MojoBootstrap::Delegate {
   TestingDelegate() : passed_(false) {}
 
   virtual void OnPipeAvailable(
-      mojo::embedder::ScopedPlatformHandle handle) OVERRIDE;
-  virtual void OnBootstrapError() OVERRIDE;
+      mojo::embedder::ScopedPlatformHandle handle) override;
+  virtual void OnBootstrapError() override;
 
   bool passed() const { return passed_; }
 
diff --git a/ipc/mojo/ipc_mojo_perftest.cc b/ipc/mojo/ipc_mojo_perftest.cc
index 20893d4..dca405e 100644
--- a/ipc/mojo/ipc_mojo_perftest.cc
+++ b/ipc/mojo/ipc_mojo_perftest.cc
@@ -31,13 +31,13 @@ public:
 
   virtual scoped_ptr<IPC::ChannelFactory> CreateChannelFactory(
       const IPC::ChannelHandle& handle,
-      base::TaskRunner* runner) OVERRIDE {
+      base::TaskRunner* runner) override {
     host_.reset(new IPC::ChannelMojoHost(task_runner()));
     return IPC::ChannelMojo::CreateServerFactory(host_->channel_delegate(),
                                                  handle);
   }
 
-  virtual bool DidStartClient() OVERRIDE {
+  virtual bool DidStartClient() override {
     bool ok = IPCTestBase::DidStartClient();
     DCHECK(ok);
     host_->OnClientLaunched(client_process());
@@ -74,7 +74,7 @@ class MojoTestClient : public IPC::test::PingPongTestClient {
   MojoTestClient();
 
   virtual scoped_ptr<IPC::Channel> CreateChannel(
-      IPC::Listener* listener) OVERRIDE;
+      IPC::Listener* listener) override;
 };
 
 MojoTestClient::MojoTestClient() {
diff --git a/ipc/sync_socket_unittest.cc b/ipc/sync_socket_unittest.cc
index 5527abc..040dcdc 100644
--- a/ipc/sync_socket_unittest.cc
+++ b/ipc/sync_socket_unittest.cc
@@ -58,7 +58,7 @@ class SyncSocketServerListener : public IPC::Listener {
     chan_ = chan;
   }
 
-  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE {
+  virtual bool OnMessageReceived(const IPC::Message& msg) override {
     if (msg.routing_id() == MSG_ROUTING_CONTROL) {
       IPC_BEGIN_MESSAGE_MAP(SyncSocketServerListener, msg)
         IPC_MESSAGE_HANDLER(MsgClassSetHandle, OnMsgClassSetHandle)
@@ -129,7 +129,7 @@ class SyncSocketClientListener : public IPC::Listener {
     chan_ = chan;
   }
 
-  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE {
+  virtual bool OnMessageReceived(const IPC::Message& msg) override {
     if (msg.routing_id() == MSG_ROUTING_CONTROL) {
       IPC_BEGIN_MESSAGE_MAP(SyncSocketClientListener, msg)
         IPC_MESSAGE_HANDLER(MsgClassResponse, OnMsgClassResponse)
diff --git a/ipc/unix_domain_socket_util_unittest.cc b/ipc/unix_domain_socket_util_unittest.cc
index 81d2f06..a67c077 100644
--- a/ipc/unix_domain_socket_util_unittest.cc
+++ b/ipc/unix_domain_socket_util_unittest.cc
@@ -60,13 +60,13 @@ class SocketAcceptor : public base::MessageLoopForIO::Watcher {
     watcher->StopWatchingFileDescriptor();
     delete watcher;
   }
-  virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE {
+  virtual void OnFileCanReadWithoutBlocking(int fd) override {
     ASSERT_EQ(-1, server_fd_);
     IPC::ServerAcceptConnection(fd, &server_fd_);
     watcher_->StopWatchingFileDescriptor();
     accepted_event_.Signal();
   }
-  virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE {}
+  virtual void OnFileCanWriteWithoutBlocking(int fd) override {}
 
   int server_fd_;
   base::MessageLoopProxy* target_thread_;