replace OVERRIDE and FINAL with override and final in remoting/

BUG=417463

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

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

56 files changed, 217 insertions, 217 deletions

diff --git a/remoting/protocol/audio_reader.h b/remoting/protocol/audio_reader.h
index fe7b806..b88b066 100644
--- a/remoting/protocol/audio_reader.h
+++ b/remoting/protocol/audio_reader.h
@@ -31,7 +31,7 @@ class AudioReader : public ChannelDispatcherBase {
   void set_audio_stub(AudioStub* audio_stub) { audio_stub_ = audio_stub; }
 
  protected:
-  virtual void OnInitialized() OVERRIDE;
+  virtual void OnInitialized() override;
 
  private:
   explicit AudioReader(AudioPacket::Encoding encoding);
diff --git a/remoting/protocol/audio_writer.h b/remoting/protocol/audio_writer.h
index 0ec008e..73aa0d3 100644
--- a/remoting/protocol/audio_writer.h
+++ b/remoting/protocol/audio_writer.h
@@ -36,10 +36,10 @@ class AudioWriter : public ChannelDispatcherBase,
 
   // AudioStub interface.
   virtual void ProcessAudioPacket(scoped_ptr<AudioPacket> packet,
-                                  const base::Closure& done) OVERRIDE;
+                                  const base::Closure& done) override;
 
  protected:
-  virtual void OnInitialized() OVERRIDE;
+  virtual void OnInitialized() override;
 
  private:
   AudioWriter();
diff --git a/remoting/protocol/authenticator_test_base.h b/remoting/protocol/authenticator_test_base.h
index 18e0c3e..f8b7e25 100644
--- a/remoting/protocol/authenticator_test_base.h
+++ b/remoting/protocol/authenticator_test_base.h
@@ -43,7 +43,7 @@ class AuthenticatorTestBase : public testing::Test {
                                        Authenticator* receiver,
                                        bool sender_started,
                                        bool receiver_srated);
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
   void RunAuthExchange();
   void RunHostInitiatedAuthExchange();
   void RunChannelAuth(bool expected_fail);
diff --git a/remoting/protocol/buffered_socket_writer.h b/remoting/protocol/buffered_socket_writer.h
index 535decb..d74cc82 100644
--- a/remoting/protocol/buffered_socket_writer.h
+++ b/remoting/protocol/buffered_socket_writer.h
@@ -107,9 +107,9 @@ class BufferedSocketWriter : public BufferedSocketWriterBase {
   virtual ~BufferedSocketWriter();
 
  protected:
-  virtual void GetNextPacket(net::IOBuffer** buffer, int* size) OVERRIDE;
-  virtual base::Closure AdvanceBufferPosition(int written) OVERRIDE;
-  virtual void OnError(int result) OVERRIDE;
+  virtual void GetNextPacket(net::IOBuffer** buffer, int* size) override;
+  virtual base::Closure AdvanceBufferPosition(int written) override;
+  virtual void OnError(int result) override;
 
  private:
   scoped_refptr<net::DrainableIOBuffer> current_buf_;
@@ -121,9 +121,9 @@ class BufferedDatagramWriter : public BufferedSocketWriterBase {
   virtual ~BufferedDatagramWriter();
 
  protected:
-  virtual void GetNextPacket(net::IOBuffer** buffer, int* size) OVERRIDE;
-  virtual base::Closure AdvanceBufferPosition(int written) OVERRIDE;
-  virtual void OnError(int result) OVERRIDE;
+  virtual void GetNextPacket(net::IOBuffer** buffer, int* size) override;
+  virtual base::Closure AdvanceBufferPosition(int written) override;
+  virtual void OnError(int result) override;
 };
 
 }  // namespace protocol
diff --git a/remoting/protocol/buffered_socket_writer_unittest.cc b/remoting/protocol/buffered_socket_writer_unittest.cc
index 2080768..1cac2229 100644
--- a/remoting/protocol/buffered_socket_writer_unittest.cc
+++ b/remoting/protocol/buffered_socket_writer_unittest.cc
@@ -47,7 +47,7 @@ class BufferedSocketWriterTest : public testing::Test {
   }
 
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     socket_.reset(new FakeStreamSocket());
     writer_.reset(new BufferedSocketWriter());
     writer_->Init(socket_.get(), base::Bind(
diff --git a/remoting/protocol/channel_multiplexer.cc b/remoting/protocol/channel_multiplexer.cc
index c0c5f78..0940f76 100644
--- a/remoting/protocol/channel_multiplexer.cc
+++ b/remoting/protocol/channel_multiplexer.cc
@@ -112,65 +112,65 @@ class ChannelMultiplexer::MuxSocket : public net::StreamSocket,
 
   // net::StreamSocket interface.
   virtual int Read(net::IOBuffer* buffer, int buffer_len,
-                   const net::CompletionCallback& callback) OVERRIDE;
+                   const net::CompletionCallback& callback) override;
   virtual int Write(net::IOBuffer* buffer, int buffer_len,
-                    const net::CompletionCallback& callback) OVERRIDE;
+                    const net::CompletionCallback& callback) override;
 
-  virtual int SetReceiveBufferSize(int32 size) OVERRIDE {
+  virtual int SetReceiveBufferSize(int32 size) override {
     NOTIMPLEMENTED();
     return net::ERR_NOT_IMPLEMENTED;
   }
-  virtual int SetSendBufferSize(int32 size) OVERRIDE {
+  virtual int SetSendBufferSize(int32 size) override {
     NOTIMPLEMENTED();
     return net::ERR_NOT_IMPLEMENTED;
   }
 
-  virtual int Connect(const net::CompletionCallback& callback) OVERRIDE {
+  virtual int Connect(const net::CompletionCallback& callback) override {
     NOTIMPLEMENTED();
     return net::ERR_NOT_IMPLEMENTED;
   }
-  virtual void Disconnect() OVERRIDE {
+  virtual void Disconnect() override {
     NOTIMPLEMENTED();
   }
-  virtual bool IsConnected() const OVERRIDE {
+  virtual bool IsConnected() const override {
     NOTIMPLEMENTED();
     return true;
   }
-  virtual bool IsConnectedAndIdle() const OVERRIDE {
+  virtual bool IsConnectedAndIdle() const override {
     NOTIMPLEMENTED();
     return false;
   }
-  virtual int GetPeerAddress(net::IPEndPoint* address) const OVERRIDE {
+  virtual int GetPeerAddress(net::IPEndPoint* address) const override {
     NOTIMPLEMENTED();
     return net::ERR_NOT_IMPLEMENTED;
   }
-  virtual int GetLocalAddress(net::IPEndPoint* address) const OVERRIDE {
+  virtual int GetLocalAddress(net::IPEndPoint* address) const override {
     NOTIMPLEMENTED();
     return net::ERR_NOT_IMPLEMENTED;
   }
-  virtual const net::BoundNetLog& NetLog() const OVERRIDE {
+  virtual const net::BoundNetLog& NetLog() const override {
     NOTIMPLEMENTED();
     return net_log_;
   }
-  virtual void SetSubresourceSpeculation() OVERRIDE {
+  virtual void SetSubresourceSpeculation() override {
     NOTIMPLEMENTED();
   }
-  virtual void SetOmniboxSpeculation() OVERRIDE {
+  virtual void SetOmniboxSpeculation() override {
     NOTIMPLEMENTED();
   }
-  virtual bool WasEverUsed() const OVERRIDE {
+  virtual bool WasEverUsed() const override {
     return true;
   }
-  virtual bool UsingTCPFastOpen() const OVERRIDE {
+  virtual bool UsingTCPFastOpen() const override {
     return false;
   }
-  virtual bool WasNpnNegotiated() const OVERRIDE {
+  virtual bool WasNpnNegotiated() const override {
     return false;
   }
-  virtual net::NextProto GetNegotiatedProtocol() const OVERRIDE {
+  virtual net::NextProto GetNegotiatedProtocol() const override {
     return net::kProtoUnknown;
   }
-  virtual bool GetSSLInfo(net::SSLInfo* ssl_info) OVERRIDE {
+  virtual bool GetSSLInfo(net::SSLInfo* ssl_info) override {
     NOTIMPLEMENTED();
     return false;
   }
diff --git a/remoting/protocol/channel_multiplexer.h b/remoting/protocol/channel_multiplexer.h
index 506dc4b..99a3112 100644
--- a/remoting/protocol/channel_multiplexer.h
+++ b/remoting/protocol/channel_multiplexer.h
@@ -25,8 +25,8 @@ class ChannelMultiplexer : public StreamChannelFactory {
 
   // StreamChannelFactory interface.
   virtual void CreateChannel(const std::string& name,
-                             const ChannelCreatedCallback& callback) OVERRIDE;
-  virtual void CancelChannelCreation(const std::string& name) OVERRIDE;
+                             const ChannelCreatedCallback& callback) override;
+  virtual void CancelChannelCreation(const std::string& name) override;
 
  private:
   struct PendingChannel;
diff --git a/remoting/protocol/channel_multiplexer_unittest.cc b/remoting/protocol/channel_multiplexer_unittest.cc
index d230f35..51370f1 100644
--- a/remoting/protocol/channel_multiplexer_unittest.cc
+++ b/remoting/protocol/channel_multiplexer_unittest.cc
@@ -70,7 +70,7 @@ class ChannelMultiplexerTest : public testing::Test {
   }
 
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     // Create pair of multiplexers and connect them to each other.
     host_mux_.reset(new ChannelMultiplexer(
         host_session_.GetTransportChannelFactory(), kMuxChannelName));
diff --git a/remoting/protocol/chromium_port_allocator.cc b/remoting/protocol/chromium_port_allocator.cc
index df9c09c..d42c4f6 100644
--- a/remoting/protocol/chromium_port_allocator.cc
+++ b/remoting/protocol/chromium_port_allocator.cc
@@ -37,11 +37,11 @@ class ChromiumPortAllocatorSession
   virtual ~ChromiumPortAllocatorSession();
 
   // cricket::HttpPortAllocatorBase overrides.
-  virtual void ConfigReady(cricket::PortConfiguration* config) OVERRIDE;
-  virtual void SendSessionRequest(const std::string& host, int port) OVERRIDE;
+  virtual void ConfigReady(cricket::PortConfiguration* config) override;
+  virtual void SendSessionRequest(const std::string& host, int port) override;
 
   // net::URLFetcherDelegate interface.
-  virtual void OnURLFetchComplete(const net::URLFetcher* url_fetcher) OVERRIDE;
+  virtual void OnURLFetchComplete(const net::URLFetcher* url_fetcher) override;
 
  private:
   scoped_refptr<net::URLRequestContextGetter> url_context_;
diff --git a/remoting/protocol/chromium_port_allocator.h b/remoting/protocol/chromium_port_allocator.h
index 576f41c..3f7418d 100644
--- a/remoting/protocol/chromium_port_allocator.h
+++ b/remoting/protocol/chromium_port_allocator.h
@@ -36,7 +36,7 @@ class ChromiumPortAllocator : public cricket::HttpPortAllocatorBase {
       const std::string& content_name,
       int component,
       const std::string& ice_username_fragment,
-      const std::string& ice_password) OVERRIDE;
+      const std::string& ice_password) override;
 
  private:
   ChromiumPortAllocator(
diff --git a/remoting/protocol/chromium_socket_factory.cc b/remoting/protocol/chromium_socket_factory.cc
index 57fb33b..ac08e1a 100644
--- a/remoting/protocol/chromium_socket_factory.cc
+++ b/remoting/protocol/chromium_socket_factory.cc
@@ -39,19 +39,19 @@ class UdpPacketSocket : public rtc::AsyncPacketSocket {
             int min_port, int max_port);
 
   // rtc::AsyncPacketSocket interface.
-  virtual rtc::SocketAddress GetLocalAddress() const OVERRIDE;
-  virtual rtc::SocketAddress GetRemoteAddress() const OVERRIDE;
+  virtual rtc::SocketAddress GetLocalAddress() const override;
+  virtual rtc::SocketAddress GetRemoteAddress() const override;
   virtual int Send(const void* data, size_t data_size,
-                   const rtc::PacketOptions& options) OVERRIDE;
+                   const rtc::PacketOptions& options) override;
   virtual int SendTo(const void* data, size_t data_size,
                      const rtc::SocketAddress& address,
-                     const rtc::PacketOptions& options) OVERRIDE;
-  virtual int Close() OVERRIDE;
-  virtual State GetState() const OVERRIDE;
-  virtual int GetOption(rtc::Socket::Option option, int* value) OVERRIDE;
-  virtual int SetOption(rtc::Socket::Option option, int value) OVERRIDE;
-  virtual int GetError() const OVERRIDE;
-  virtual void SetError(int error) OVERRIDE;
+                     const rtc::PacketOptions& options) override;
+  virtual int Close() override;
+  virtual State GetState() const override;
+  virtual int GetOption(rtc::Socket::Option option, int* value) override;
+  virtual int SetOption(rtc::Socket::Option option, int value) override;
+  virtual int GetError() const override;
+  virtual void SetError(int error) override;
 
  private:
   struct PendingPacket {
diff --git a/remoting/protocol/chromium_socket_factory.h b/remoting/protocol/chromium_socket_factory.h
index b07b03c..2570e7b 100644
--- a/remoting/protocol/chromium_socket_factory.h
+++ b/remoting/protocol/chromium_socket_factory.h
@@ -18,18 +18,18 @@ class ChromiumPacketSocketFactory : public rtc::PacketSocketFactory {
 
   virtual rtc::AsyncPacketSocket* CreateUdpSocket(
       const rtc::SocketAddress& local_address,
-      int min_port, int max_port) OVERRIDE;
+      int min_port, int max_port) override;
   virtual rtc::AsyncPacketSocket* CreateServerTcpSocket(
       const rtc::SocketAddress& local_address,
       int min_port, int max_port,
-      int opts) OVERRIDE;
+      int opts) override;
   virtual rtc::AsyncPacketSocket* CreateClientTcpSocket(
       const rtc::SocketAddress& local_address,
       const rtc::SocketAddress& remote_address,
       const rtc::ProxyInfo& proxy_info,
       const std::string& user_agent,
-      int opts) OVERRIDE;
-  virtual rtc::AsyncResolverInterface* CreateAsyncResolver() OVERRIDE;
+      int opts) override;
+  virtual rtc::AsyncResolverInterface* CreateAsyncResolver() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ChromiumPacketSocketFactory);
diff --git a/remoting/protocol/chromium_socket_factory_unittest.cc b/remoting/protocol/chromium_socket_factory_unittest.cc
index 9a0a4dc..b68d25c 100644
--- a/remoting/protocol/chromium_socket_factory_unittest.cc
+++ b/remoting/protocol/chromium_socket_factory_unittest.cc
@@ -17,7 +17,7 @@ namespace protocol {
 class ChromiumSocketFactoryTest : public testing::Test,
                                   public sigslot::has_slots<> {
  public:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     socket_factory_.reset(new ChromiumPacketSocketFactory());
 
     socket_.reset(socket_factory_->CreateUdpSocket(
diff --git a/remoting/protocol/client_control_dispatcher.h b/remoting/protocol/client_control_dispatcher.h
index 556ce72..8e94fc3f 100644
--- a/remoting/protocol/client_control_dispatcher.h
+++ b/remoting/protocol/client_control_dispatcher.h
@@ -31,16 +31,16 @@ class ClientControlDispatcher : public ChannelDispatcherBase,
   virtual ~ClientControlDispatcher();
 
   // ClipboardStub implementation.
-  virtual void InjectClipboardEvent(const ClipboardEvent& event) OVERRIDE;
+  virtual void InjectClipboardEvent(const ClipboardEvent& event) override;
 
   // HostStub implementation.
   virtual void NotifyClientResolution(
-      const ClientResolution& resolution) OVERRIDE;
-  virtual void ControlVideo(const VideoControl& video_control) OVERRIDE;
-  virtual void ControlAudio(const AudioControl& audio_control) OVERRIDE;
-  virtual void SetCapabilities(const Capabilities& capabilities) OVERRIDE;
-  virtual void RequestPairing(const PairingRequest& pairing_request) OVERRIDE;
-  virtual void DeliverClientMessage(const ExtensionMessage& message) OVERRIDE;
+      const ClientResolution& resolution) override;
+  virtual void ControlVideo(const VideoControl& video_control) override;
+  virtual void ControlAudio(const AudioControl& audio_control) override;
+  virtual void SetCapabilities(const Capabilities& capabilities) override;
+  virtual void RequestPairing(const PairingRequest& pairing_request) override;
+  virtual void DeliverClientMessage(const ExtensionMessage& message) override;
 
   // Sets the ClientStub that will be called for each incoming control
   // message. |client_stub| must outlive this object.
@@ -54,7 +54,7 @@ class ClientControlDispatcher : public ChannelDispatcherBase,
 
  protected:
   // ChannelDispatcherBase overrides.
-  virtual void OnInitialized() OVERRIDE;
+  virtual void OnInitialized() override;
 
  private:
   void OnMessageReceived(scoped_ptr<ControlMessage> message,
diff --git a/remoting/protocol/client_event_dispatcher.h b/remoting/protocol/client_event_dispatcher.h
index 6e5f8fe..35c8ddd 100644
--- a/remoting/protocol/client_event_dispatcher.h
+++ b/remoting/protocol/client_event_dispatcher.h
@@ -21,13 +21,13 @@ class ClientEventDispatcher : public ChannelDispatcherBase, public InputStub {
   virtual ~ClientEventDispatcher();
 
   // InputStub implementation.
-  virtual void InjectKeyEvent(const KeyEvent& event) OVERRIDE;
-  virtual void InjectTextEvent(const TextEvent& event) OVERRIDE;
-  virtual void InjectMouseEvent(const MouseEvent& event) OVERRIDE;
+  virtual void InjectKeyEvent(const KeyEvent& event) override;
+  virtual void InjectTextEvent(const TextEvent& event) override;
+  virtual void InjectMouseEvent(const MouseEvent& event) override;
 
  protected:
   // ChannelDispatcherBase overrides.
-  virtual void OnInitialized() OVERRIDE;
+  virtual void OnInitialized() override;
 
  private:
   BufferedSocketWriter writer_;
diff --git a/remoting/protocol/client_video_dispatcher.h b/remoting/protocol/client_video_dispatcher.h
index f62525c6..7fb57c6 100644
--- a/remoting/protocol/client_video_dispatcher.h
+++ b/remoting/protocol/client_video_dispatcher.h
@@ -22,7 +22,7 @@ class ClientVideoDispatcher : public ChannelDispatcherBase {
 
  protected:
   // ChannelDispatcherBase overrides.
-  virtual void OnInitialized() OVERRIDE;
+  virtual void OnInitialized() override;
 
  private:
   ProtobufMessageReader<VideoPacket> reader_;
diff --git a/remoting/protocol/clipboard_echo_filter.h b/remoting/protocol/clipboard_echo_filter.h
index 6348685..1c9b1bf 100644
--- a/remoting/protocol/clipboard_echo_filter.h
+++ b/remoting/protocol/clipboard_echo_filter.h
@@ -39,7 +39,7 @@ class ClipboardEchoFilter {
   class ClientFilter : public ClipboardStub {
    public:
     ClientFilter(ClipboardEchoFilter* filter);
-    virtual void InjectClipboardEvent(const ClipboardEvent& event) OVERRIDE;
+    virtual void InjectClipboardEvent(const ClipboardEvent& event) override;
 
    private:
     ClipboardEchoFilter* filter_;
@@ -48,7 +48,7 @@ class ClipboardEchoFilter {
   class HostFilter : public ClipboardStub {
    public:
     HostFilter(ClipboardEchoFilter* filter);
-    virtual void InjectClipboardEvent(const ClipboardEvent& event) OVERRIDE;
+    virtual void InjectClipboardEvent(const ClipboardEvent& event) override;
 
    private:
     ClipboardEchoFilter* filter_;
diff --git a/remoting/protocol/clipboard_filter.h b/remoting/protocol/clipboard_filter.h
index 0cae152..19a8d25 100644
--- a/remoting/protocol/clipboard_filter.h
+++ b/remoting/protocol/clipboard_filter.h
@@ -29,7 +29,7 @@ class ClipboardFilter : public ClipboardStub {
   bool enabled() const { return enabled_; }
 
   // ClipboardStub interface.
-  virtual void InjectClipboardEvent(const ClipboardEvent& event) OVERRIDE;
+  virtual void InjectClipboardEvent(const ClipboardEvent& event) override;
 
  private:
   ClipboardStub* clipboard_stub_;
diff --git a/remoting/protocol/clipboard_thread_proxy.h b/remoting/protocol/clipboard_thread_proxy.h
index 14f3a45..ba63981 100644
--- a/remoting/protocol/clipboard_thread_proxy.h
+++ b/remoting/protocol/clipboard_thread_proxy.h
@@ -30,7 +30,7 @@ class ClipboardThreadProxy : public ClipboardStub {
       scoped_refptr<base::TaskRunner> clipboard_stub_task_runner);
 
   // ClipboardStub implementation.
-  virtual void InjectClipboardEvent(const ClipboardEvent& event) OVERRIDE;
+  virtual void InjectClipboardEvent(const ClipboardEvent& event) override;
 
  private:
   // Injects a clipboard event into a stub, if the given weak pointer to the
diff --git a/remoting/protocol/connection_to_client.h b/remoting/protocol/connection_to_client.h
index 8fb9a8b..aee5e4a 100644
--- a/remoting/protocol/connection_to_client.h
+++ b/remoting/protocol/connection_to_client.h
@@ -101,9 +101,9 @@ class ConnectionToClient : public base::NonThreadSafe,
   virtual InputStub* input_stub();
 
   // Session::EventHandler interface.
-  virtual void OnSessionStateChange(Session::State state) OVERRIDE;
+  virtual void OnSessionStateChange(Session::State state) override;
   virtual void OnSessionRouteChange(const std::string& channel_name,
-                                    const TransportRoute& route) OVERRIDE;
+                                    const TransportRoute& route) override;
 
  private:
   // Callback for channel initialization.
diff --git a/remoting/protocol/connection_to_client_unittest.cc b/remoting/protocol/connection_to_client_unittest.cc
index e285592..ded0197 100644
--- a/remoting/protocol/connection_to_client_unittest.cc
+++ b/remoting/protocol/connection_to_client_unittest.cc
@@ -26,7 +26,7 @@ class ConnectionToClientTest : public testing::Test {
   }
 
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     session_ = new FakeSession();
 
     // Allocate a ClientConnection object with the mock objects.
@@ -42,7 +42,7 @@ class ConnectionToClientTest : public testing::Test {
     base::RunLoop().RunUntilIdle();
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     viewer_.reset();
     base::RunLoop().RunUntilIdle();
   }
diff --git a/remoting/protocol/connection_to_host.h b/remoting/protocol/connection_to_host.h
index 6d22a83..fb7a34d 100644
--- a/remoting/protocol/connection_to_host.h
+++ b/remoting/protocol/connection_to_host.h
@@ -121,20 +121,20 @@ class ConnectionToHost : public SignalStrategy::Listener,
 
   // SignalStrategy::StatusObserver interface.
   virtual void OnSignalStrategyStateChange(
-      SignalStrategy::State state) OVERRIDE;
+      SignalStrategy::State state) override;
   virtual bool OnSignalStrategyIncomingStanza(
-      const buzz::XmlElement* stanza) OVERRIDE;
+      const buzz::XmlElement* stanza) override;
 
   // SessionManager::Listener interface.
-  virtual void OnSessionManagerReady() OVERRIDE;
+  virtual void OnSessionManagerReady() override;
   virtual void OnIncomingSession(
       Session* session,
-      SessionManager::IncomingSessionResponse* response) OVERRIDE;
+      SessionManager::IncomingSessionResponse* response) override;
 
   // Session::EventHandler interface.
-  virtual void OnSessionStateChange(Session::State state) OVERRIDE;
+  virtual void OnSessionStateChange(Session::State state) override;
   virtual void OnSessionRouteChange(const std::string& channel_name,
-                                    const TransportRoute& route) OVERRIDE;
+                                    const TransportRoute& route) override;
 
   // MonitoredVideoStub::EventHandler interface.
   virtual void OnVideoChannelStatus(bool active);
diff --git a/remoting/protocol/content_description.h b/remoting/protocol/content_description.h
index 65115c2..a871858 100644
--- a/remoting/protocol/content_description.h
+++ b/remoting/protocol/content_description.h
@@ -32,7 +32,7 @@ class ContentDescription : public cricket::ContentDescription {
                      scoped_ptr<buzz::XmlElement> authenticator_message);
   virtual ~ContentDescription();
 
-  virtual ContentDescription* Copy() const OVERRIDE;
+  virtual ContentDescription* Copy() const override;
 
   const CandidateSessionConfig* config() const {
     return candidate_config_.get();
diff --git a/remoting/protocol/fake_authenticator.h b/remoting/protocol/fake_authenticator.h
index a6ddc74..c55030c 100644
--- a/remoting/protocol/fake_authenticator.h
+++ b/remoting/protocol/fake_authenticator.h
@@ -21,7 +21,7 @@ class FakeChannelAuthenticator : public ChannelAuthenticator {
   // ChannelAuthenticator interface.
   virtual void SecureAndAuthenticate(
       scoped_ptr<net::StreamSocket> socket,
-      const DoneCallback& done_callback) OVERRIDE;
+      const DoneCallback& done_callback) override;
 
  private:
   void OnAuthBytesWritten(int result);
@@ -65,14 +65,14 @@ class FakeAuthenticator : public Authenticator {
   void set_messages_till_started(int messages);
 
   // Authenticator interface.
-  virtual State state() const OVERRIDE;
-  virtual bool started() const OVERRIDE;
-  virtual RejectionReason rejection_reason() const OVERRIDE;
+  virtual State state() const override;
+  virtual bool started() const override;
+  virtual RejectionReason rejection_reason() const override;
   virtual void ProcessMessage(const buzz::XmlElement* message,
-                              const base::Closure& resume_callback) OVERRIDE;
-  virtual scoped_ptr<buzz::XmlElement> GetNextMessage() OVERRIDE;
+                              const base::Closure& resume_callback) override;
+  virtual scoped_ptr<buzz::XmlElement> GetNextMessage() override;
   virtual scoped_ptr<ChannelAuthenticator>
-      CreateChannelAuthenticator() const OVERRIDE;
+      CreateChannelAuthenticator() const override;
 
  protected:
   Type type_;
@@ -100,7 +100,7 @@ class FakeHostAuthenticatorFactory : public AuthenticatorFactory {
   virtual scoped_ptr<Authenticator> CreateAuthenticator(
       const std::string& local_jid,
       const std::string& remote_jid,
-      const buzz::XmlElement* first_message) OVERRIDE;
+      const buzz::XmlElement* first_message) override;
 
  private:
   int round_trips_;
diff --git a/remoting/protocol/fake_datagram_socket.h b/remoting/protocol/fake_datagram_socket.h
index 9f759d7..0d1c4f4 100644
--- a/remoting/protocol/fake_datagram_socket.h
+++ b/remoting/protocol/fake_datagram_socket.h
@@ -55,11 +55,11 @@ class FakeDatagramSocket : public net::Socket {
 
   // net::Socket implementation.
   virtual int Read(net::IOBuffer* buf, int buf_len,
-                   const net::CompletionCallback& callback) OVERRIDE;
+                   const net::CompletionCallback& callback) override;
   virtual int Write(net::IOBuffer* buf, int buf_len,
-                    const net::CompletionCallback& callback) OVERRIDE;
-  virtual int SetReceiveBufferSize(int32 size) OVERRIDE;
-  virtual int SetSendBufferSize(int32 size) OVERRIDE;
+                    const net::CompletionCallback& callback) override;
+  virtual int SetReceiveBufferSize(int32 size) override;
+  virtual int SetSendBufferSize(int32 size) override;
 
  private:
   int CopyReadData(net::IOBuffer* buf, int buf_len);
@@ -103,8 +103,8 @@ class FakeDatagramChannelFactory : public DatagramChannelFactory {
 
   // DatagramChannelFactory interface.
   virtual void CreateChannel(const std::string& name,
-                             const ChannelCreatedCallback& callback) OVERRIDE;
-  virtual void CancelChannelCreation(const std::string& name) OVERRIDE;
+                             const ChannelCreatedCallback& callback) override;
+  virtual void CancelChannelCreation(const std::string& name) override;
 
  private:
   typedef std::map<std::string, base::WeakPtr<FakeDatagramSocket> > ChannelsMap;
diff --git a/remoting/protocol/fake_session.h b/remoting/protocol/fake_session.h
index b04cdd8..5148688 100644
--- a/remoting/protocol/fake_session.h
+++ b/remoting/protocol/fake_session.h
@@ -34,15 +34,15 @@ class FakeSession : public Session {
   FakeStreamChannelFactory& fake_channel_factory() { return channel_factory_; }
 
   // Session interface.
-  virtual void SetEventHandler(EventHandler* event_handler) OVERRIDE;
-  virtual ErrorCode error() OVERRIDE;
-  virtual const std::string& jid() OVERRIDE;
-  virtual const CandidateSessionConfig* candidate_config() OVERRIDE;
-  virtual const SessionConfig& config() OVERRIDE;
-  virtual void set_config(const SessionConfig& config) OVERRIDE;
-  virtual StreamChannelFactory* GetTransportChannelFactory() OVERRIDE;
-  virtual StreamChannelFactory* GetMultiplexedChannelFactory() OVERRIDE;
-  virtual void Close() OVERRIDE;
+  virtual void SetEventHandler(EventHandler* event_handler) override;
+  virtual ErrorCode error() override;
+  virtual const std::string& jid() override;
+  virtual const CandidateSessionConfig* candidate_config() override;
+  virtual const SessionConfig& config() override;
+  virtual void set_config(const SessionConfig& config) override;
+  virtual StreamChannelFactory* GetTransportChannelFactory() override;
+  virtual StreamChannelFactory* GetMultiplexedChannelFactory() override;
+  virtual void Close() override;
 
  public:
   EventHandler* event_handler_;
diff --git a/remoting/protocol/fake_stream_socket.h b/remoting/protocol/fake_stream_socket.h
index 264e254..1ba667a 100644
--- a/remoting/protocol/fake_stream_socket.h
+++ b/remoting/protocol/fake_stream_socket.h
@@ -67,27 +67,27 @@ class FakeStreamSocket : public net::StreamSocket {
 
   // net::Socket implementation.
   virtual int Read(net::IOBuffer* buf, int buf_len,
-                   const net::CompletionCallback& callback) OVERRIDE;
+                   const net::CompletionCallback& callback) override;
   virtual int Write(net::IOBuffer* buf, int buf_len,
-                    const net::CompletionCallback& callback) OVERRIDE;
-  virtual int SetReceiveBufferSize(int32 size) OVERRIDE;
-  virtual int SetSendBufferSize(int32 size) OVERRIDE;
+                    const net::CompletionCallback& callback) override;
+  virtual int SetReceiveBufferSize(int32 size) override;
+  virtual int SetSendBufferSize(int32 size) override;
 
   // net::StreamSocket interface.
-  virtual int Connect(const net::CompletionCallback& callback) OVERRIDE;
-  virtual void Disconnect() OVERRIDE;
-  virtual bool IsConnected() const OVERRIDE;
-  virtual bool IsConnectedAndIdle() const OVERRIDE;
-  virtual int GetPeerAddress(net::IPEndPoint* address) const OVERRIDE;
-  virtual int GetLocalAddress(net::IPEndPoint* address) const OVERRIDE;
-  virtual const net::BoundNetLog& NetLog() const OVERRIDE;
-  virtual void SetSubresourceSpeculation() OVERRIDE;
-  virtual void SetOmniboxSpeculation() OVERRIDE;
-  virtual bool WasEverUsed() const OVERRIDE;
-  virtual bool UsingTCPFastOpen() const OVERRIDE;
-  virtual bool WasNpnNegotiated() const OVERRIDE;
-  virtual net::NextProto GetNegotiatedProtocol() const OVERRIDE;
-  virtual bool GetSSLInfo(net::SSLInfo* ssl_info) OVERRIDE;
+  virtual int Connect(const net::CompletionCallback& callback) override;
+  virtual void Disconnect() override;
+  virtual bool IsConnected() const override;
+  virtual bool IsConnectedAndIdle() const override;
+  virtual int GetPeerAddress(net::IPEndPoint* address) const override;
+  virtual int GetLocalAddress(net::IPEndPoint* address) const override;
+  virtual const net::BoundNetLog& NetLog() const override;
+  virtual void SetSubresourceSpeculation() override;
+  virtual void SetOmniboxSpeculation() override;
+  virtual bool WasEverUsed() const override;
+  virtual bool UsingTCPFastOpen() const override;
+  virtual bool WasNpnNegotiated() const override;
+  virtual net::NextProto GetNegotiatedProtocol() const override;
+  virtual bool GetSSLInfo(net::SSLInfo* ssl_info) override;
 
  private:
   void DoAsyncWrite(scoped_refptr<net::IOBuffer> buf, int buf_len,
@@ -133,8 +133,8 @@ class FakeStreamChannelFactory : public StreamChannelFactory {
 
   // ChannelFactory interface.
   virtual void CreateChannel(const std::string& name,
-                             const ChannelCreatedCallback& callback) OVERRIDE;
-  virtual void CancelChannelCreation(const std::string& name) OVERRIDE;
+                             const ChannelCreatedCallback& callback) override;
+  virtual void CancelChannelCreation(const std::string& name) override;
 
  private:
   void NotifyChannelCreated(scoped_ptr<FakeStreamSocket> owned_channel,
diff --git a/remoting/protocol/host_control_dispatcher.h b/remoting/protocol/host_control_dispatcher.h
index 82aa793..f97cfcd 100644
--- a/remoting/protocol/host_control_dispatcher.h
+++ b/remoting/protocol/host_control_dispatcher.h
@@ -34,17 +34,17 @@ class HostControlDispatcher : public ChannelDispatcherBase,
   virtual ~HostControlDispatcher();
 
   // ClientStub implementation.
-  virtual void SetCapabilities(const Capabilities& capabilities) OVERRIDE;
+  virtual void SetCapabilities(const Capabilities& capabilities) override;
   virtual void SetPairingResponse(
-      const PairingResponse& pairing_response) OVERRIDE;
+      const PairingResponse& pairing_response) override;
   virtual void DeliverHostMessage(
-      const ExtensionMessage& message) OVERRIDE;
+      const ExtensionMessage& message) override;
 
   // ClipboardStub implementation for sending clipboard data to client.
-  virtual void InjectClipboardEvent(const ClipboardEvent& event) OVERRIDE;
+  virtual void InjectClipboardEvent(const ClipboardEvent& event) override;
 
   // CursorShapeStub implementation for sending cursor shape to client.
-  virtual void SetCursorShape(const CursorShapeInfo& cursor_shape) OVERRIDE;
+  virtual void SetCursorShape(const CursorShapeInfo& cursor_shape) override;
 
   // Sets the ClipboardStub that will be called for each incoming clipboard
   // message. |clipboard_stub| must outlive this object.
@@ -58,7 +58,7 @@ class HostControlDispatcher : public ChannelDispatcherBase,
 
  protected:
   // ChannelDispatcherBase overrides.
-  virtual void OnInitialized() OVERRIDE;
+  virtual void OnInitialized() override;
 
  private:
   void OnMessageReceived(scoped_ptr<ControlMessage> message,
diff --git a/remoting/protocol/host_event_dispatcher.h b/remoting/protocol/host_event_dispatcher.h
index e5d1a46..d7afc39 100644
--- a/remoting/protocol/host_event_dispatcher.h
+++ b/remoting/protocol/host_event_dispatcher.h
@@ -36,7 +36,7 @@ class HostEventDispatcher : public ChannelDispatcherBase {
 
  protected:
   // ChannelDispatcherBase overrides.
-  virtual void OnInitialized() OVERRIDE;
+  virtual void OnInitialized() override;
 
  private:
   void OnMessageReceived(scoped_ptr<EventMessage> message,
diff --git a/remoting/protocol/host_video_dispatcher.h b/remoting/protocol/host_video_dispatcher.h
index 3c80166..9e319c2 100644
--- a/remoting/protocol/host_video_dispatcher.h
+++ b/remoting/protocol/host_video_dispatcher.h
@@ -22,11 +22,11 @@ class HostVideoDispatcher : public ChannelDispatcherBase, public VideoStub {
 
   // VideoStub interface.
   virtual void ProcessVideoPacket(scoped_ptr<VideoPacket> packet,
-                                  const base::Closure& done) OVERRIDE;
+                                  const base::Closure& done) override;
 
  protected:
   // ChannelDispatcherBase overrides.
-  virtual void OnInitialized() OVERRIDE;
+  virtual void OnInitialized() override;
 
  private:
   BufferedSocketWriter writer_;
diff --git a/remoting/protocol/input_event_tracker.h b/remoting/protocol/input_event_tracker.h
index f357583..82e20e2 100644
--- a/remoting/protocol/input_event_tracker.h
+++ b/remoting/protocol/input_event_tracker.h
@@ -34,9 +34,9 @@ class InputEventTracker : public InputStub {
   void ReleaseAll();
 
   // InputStub interface.
-  virtual void InjectKeyEvent(const KeyEvent& event) OVERRIDE;
-  virtual void InjectTextEvent(const TextEvent& event) OVERRIDE;
-  virtual void InjectMouseEvent(const MouseEvent& event) OVERRIDE;
+  virtual void InjectKeyEvent(const KeyEvent& event) override;
+  virtual void InjectTextEvent(const TextEvent& event) override;
+  virtual void InjectMouseEvent(const MouseEvent& event) override;
 
  private:
   protocol::InputStub* input_stub_;
diff --git a/remoting/protocol/input_filter.h b/remoting/protocol/input_filter.h
index 5384ade..07be12a 100644
--- a/remoting/protocol/input_filter.h
+++ b/remoting/protocol/input_filter.h
@@ -35,9 +35,9 @@ class InputFilter : public InputStub {
   }
 
   // InputStub interface.
-  virtual void InjectKeyEvent(const KeyEvent& event) OVERRIDE;
-  virtual void InjectTextEvent(const TextEvent& event) OVERRIDE;
-  virtual void InjectMouseEvent(const MouseEvent& event) OVERRIDE;
+  virtual void InjectKeyEvent(const KeyEvent& event) override;
+  virtual void InjectTextEvent(const TextEvent& event) override;
+  virtual void InjectMouseEvent(const MouseEvent& event) override;
 
  private:
   InputStub* input_stub_;
diff --git a/remoting/protocol/it2me_host_authenticator_factory.h b/remoting/protocol/it2me_host_authenticator_factory.h
index 6683e33..14c3008 100644
--- a/remoting/protocol/it2me_host_authenticator_factory.h
+++ b/remoting/protocol/it2me_host_authenticator_factory.h
@@ -33,7 +33,7 @@ class It2MeHostAuthenticatorFactory : public AuthenticatorFactory {
   virtual scoped_ptr<Authenticator> CreateAuthenticator(
       const std::string& local_jid,
       const std::string& remote_jid,
-      const buzz::XmlElement* first_message) OVERRIDE;
+      const buzz::XmlElement* first_message) override;
 
  private:
   std::string local_cert_;
diff --git a/remoting/protocol/jingle_session.h b/remoting/protocol/jingle_session.h
index 9ec6206..8c509e6 100644
--- a/remoting/protocol/jingle_session.h
+++ b/remoting/protocol/jingle_session.h
@@ -46,29 +46,29 @@ class JingleSession : public base::NonThreadSafe,
   virtual ~JingleSession();
 
   // Session interface.
-  virtual void SetEventHandler(Session::EventHandler* event_handler) OVERRIDE;
-  virtual ErrorCode error() OVERRIDE;
-  virtual const std::string& jid() OVERRIDE;
-  virtual const CandidateSessionConfig* candidate_config() OVERRIDE;
-  virtual const SessionConfig& config() OVERRIDE;
-  virtual void set_config(const SessionConfig& config) OVERRIDE;
-  virtual StreamChannelFactory* GetTransportChannelFactory() OVERRIDE;
-  virtual StreamChannelFactory* GetMultiplexedChannelFactory() OVERRIDE;
-  virtual void Close() OVERRIDE;
+  virtual void SetEventHandler(Session::EventHandler* event_handler) override;
+  virtual ErrorCode error() override;
+  virtual const std::string& jid() override;
+  virtual const CandidateSessionConfig* candidate_config() override;
+  virtual const SessionConfig& config() override;
+  virtual void set_config(const SessionConfig& config) override;
+  virtual StreamChannelFactory* GetTransportChannelFactory() override;
+  virtual StreamChannelFactory* GetMultiplexedChannelFactory() override;
+  virtual void Close() override;
 
   // DatagramChannelFactory interface.
   virtual void CreateChannel(const std::string& name,
-                             const ChannelCreatedCallback& callback) OVERRIDE;
-  virtual void CancelChannelCreation(const std::string& name) OVERRIDE;
+                             const ChannelCreatedCallback& callback) override;
+  virtual void CancelChannelCreation(const std::string& name) override;
 
   // Transport::EventHandler interface.
   virtual void OnTransportCandidate(
       Transport* transport,
-      const cricket::Candidate& candidate) OVERRIDE;
+      const cricket::Candidate& candidate) override;
   virtual void OnTransportRouteChange(Transport* transport,
-                                      const TransportRoute& route) OVERRIDE;
-  virtual void OnTransportFailed(Transport* transport) OVERRIDE;
-  virtual void OnTransportDeleted(Transport* transport) OVERRIDE;
+                                      const TransportRoute& route) override;
+  virtual void OnTransportFailed(Transport* transport) override;
+  virtual void OnTransportDeleted(Transport* transport) override;
 
  private:
   friend class JingleSessionManager;
diff --git a/remoting/protocol/jingle_session_manager.h b/remoting/protocol/jingle_session_manager.h
index 89df613..4cb8890 100644
--- a/remoting/protocol/jingle_session_manager.h
+++ b/remoting/protocol/jingle_session_manager.h
@@ -48,20 +48,20 @@ class JingleSessionManager : public SessionManager,
 
   // SessionManager interface.
   virtual void Init(SignalStrategy* signal_strategy,
-                    SessionManager::Listener* listener) OVERRIDE;
+                    SessionManager::Listener* listener) override;
   virtual scoped_ptr<Session> Connect(
       const std::string& host_jid,
       scoped_ptr<Authenticator> authenticator,
-      scoped_ptr<CandidateSessionConfig> config) OVERRIDE;
-  virtual void Close() OVERRIDE;
+      scoped_ptr<CandidateSessionConfig> config) override;
+  virtual void Close() override;
   virtual void set_authenticator_factory(
-      scoped_ptr<AuthenticatorFactory> authenticator_factory) OVERRIDE;
+      scoped_ptr<AuthenticatorFactory> authenticator_factory) override;
 
   // SignalStrategy::Listener interface.
   virtual void OnSignalStrategyStateChange(
-      SignalStrategy::State state) OVERRIDE;
+      SignalStrategy::State state) override;
   virtual bool OnSignalStrategyIncomingStanza(
-      const buzz::XmlElement* stanza) OVERRIDE;
+      const buzz::XmlElement* stanza) override;
 
  private:
   friend class JingleSession;
diff --git a/remoting/protocol/libjingle_transport_factory.cc b/remoting/protocol/libjingle_transport_factory.cc
index 0fe0c10..b2302f8 100644
--- a/remoting/protocol/libjingle_transport_factory.cc
+++ b/remoting/protocol/libjingle_transport_factory.cc
@@ -48,10 +48,10 @@ class LibjingleTransport
   virtual void Connect(
       const std::string& name,
       Transport::EventHandler* event_handler,
-      const Transport::ConnectedCallback& callback) OVERRIDE;
-  virtual void AddRemoteCandidate(const cricket::Candidate& candidate) OVERRIDE;
-  virtual const std::string& name() const OVERRIDE;
-  virtual bool is_connected() const OVERRIDE;
+      const Transport::ConnectedCallback& callback) override;
+  virtual void AddRemoteCandidate(const cricket::Candidate& candidate) override;
+  virtual const std::string& name() const override;
+  virtual bool is_connected() const override;
 
  private:
   void DoStart();
diff --git a/remoting/protocol/libjingle_transport_factory.h b/remoting/protocol/libjingle_transport_factory.h
index 0b20ff7..eda5b72 100644
--- a/remoting/protocol/libjingle_transport_factory.h
+++ b/remoting/protocol/libjingle_transport_factory.h
@@ -46,8 +46,8 @@ class LibjingleTransportFactory : public TransportFactory {
   virtual ~LibjingleTransportFactory();
 
   // TransportFactory interface.
-  virtual void PrepareTokens() OVERRIDE;
-  virtual scoped_ptr<Transport> CreateTransport() OVERRIDE;
+  virtual void PrepareTokens() override;
+  virtual scoped_ptr<Transport> CreateTransport() override;
 
  private:
   void EnsureFreshJingleInfo();
diff --git a/remoting/protocol/me2me_host_authenticator_factory.cc b/remoting/protocol/me2me_host_authenticator_factory.cc
index e69f7f9..1cd7db1 100644
--- a/remoting/protocol/me2me_host_authenticator_factory.cc
+++ b/remoting/protocol/me2me_host_authenticator_factory.cc
@@ -26,33 +26,33 @@ class RejectingAuthenticator : public Authenticator {
   virtual ~RejectingAuthenticator() {
   }
 
-  virtual State state() const OVERRIDE {
+  virtual State state() const override {
     return state_;
   }
 
-  virtual bool started() const OVERRIDE {
+  virtual bool started() const override {
     return true;
   }
 
-  virtual RejectionReason rejection_reason() const OVERRIDE {
+  virtual RejectionReason rejection_reason() const override {
     DCHECK_EQ(state_, REJECTED);
     return INVALID_CREDENTIALS;
   }
 
   virtual void ProcessMessage(const buzz::XmlElement* message,
-                              const base::Closure& resume_callback) OVERRIDE {
+                              const base::Closure& resume_callback) override {
     DCHECK_EQ(state_, WAITING_MESSAGE);
     state_ = REJECTED;
     resume_callback.Run();
   }
 
-  virtual scoped_ptr<buzz::XmlElement> GetNextMessage() OVERRIDE {
+  virtual scoped_ptr<buzz::XmlElement> GetNextMessage() override {
     NOTREACHED();
     return nullptr;
   }
 
   virtual scoped_ptr<ChannelAuthenticator>
-  CreateChannelAuthenticator() const OVERRIDE {
+  CreateChannelAuthenticator() const override {
     NOTREACHED();
     return nullptr;
   }
diff --git a/remoting/protocol/me2me_host_authenticator_factory.h b/remoting/protocol/me2me_host_authenticator_factory.h
index 23a6ae4..bc1676d 100644
--- a/remoting/protocol/me2me_host_authenticator_factory.h
+++ b/remoting/protocol/me2me_host_authenticator_factory.h
@@ -54,7 +54,7 @@ class Me2MeHostAuthenticatorFactory : public AuthenticatorFactory {
   virtual scoped_ptr<Authenticator> CreateAuthenticator(
       const std::string& local_jid,
       const std::string& remote_jid,
-      const buzz::XmlElement* first_message) OVERRIDE;
+      const buzz::XmlElement* first_message) override;
 
  private:
   // Used for all host authenticators.
diff --git a/remoting/protocol/message_reader_unittest.cc b/remoting/protocol/message_reader_unittest.cc
index 6e8f5c6..cb60368 100644
--- a/remoting/protocol/message_reader_unittest.cc
+++ b/remoting/protocol/message_reader_unittest.cc
@@ -67,11 +67,11 @@ class MessageReaderTest : public testing::Test {
   }
 
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     reader_.reset(new MessageReader());
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     STLDeleteElements(&messages_);
   }
 
diff --git a/remoting/protocol/monitored_video_stub.h b/remoting/protocol/monitored_video_stub.h
index 713878c..a3675fc 100644
--- a/remoting/protocol/monitored_video_stub.h
+++ b/remoting/protocol/monitored_video_stub.h
@@ -41,7 +41,7 @@ class MonitoredVideoStub : public VideoStub {
 
   // VideoStub implementation.
   virtual void ProcessVideoPacket(scoped_ptr<VideoPacket> packet,
-                                  const base::Closure& done) OVERRIDE;
+                                  const base::Closure& done) override;
 
  private:
   void OnConnectivityCheckTimeout();
diff --git a/remoting/protocol/monitored_video_stub_unittest.cc b/remoting/protocol/monitored_video_stub_unittest.cc
index 8cd8f48..67162c3 100644
--- a/remoting/protocol/monitored_video_stub_unittest.cc
+++ b/remoting/protocol/monitored_video_stub_unittest.cc
@@ -24,7 +24,7 @@ static const int64 kTestOverrideDelayMilliseconds = 1;
 
 class MonitoredVideoStubTest : public testing::Test {
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     packet_.reset(new VideoPacket());
     monitor_.reset(new MonitoredVideoStub(
         &video_stub_,
diff --git a/remoting/protocol/mouse_input_filter.h b/remoting/protocol/mouse_input_filter.h
index 47dae11..3fc6d9c 100644
--- a/remoting/protocol/mouse_input_filter.h
+++ b/remoting/protocol/mouse_input_filter.h
@@ -28,7 +28,7 @@ class MouseInputFilter : public InputFilter {
   void set_output_size(const webrtc::DesktopSize& size);
 
   // InputStub overrides.
-  virtual void InjectMouseEvent(const protocol::MouseEvent& event) OVERRIDE;
+  virtual void InjectMouseEvent(const protocol::MouseEvent& event) override;
 
  private:
   webrtc::DesktopSize input_max_;
diff --git a/remoting/protocol/negotiating_authenticator_base.h b/remoting/protocol/negotiating_authenticator_base.h
index fabd517..e213a2d 100644
--- a/remoting/protocol/negotiating_authenticator_base.h
+++ b/remoting/protocol/negotiating_authenticator_base.h
@@ -63,11 +63,11 @@ class NegotiatingAuthenticatorBase : public Authenticator {
   virtual ~NegotiatingAuthenticatorBase();
 
   // Authenticator interface.
-  virtual State state() const OVERRIDE;
-  virtual bool started() const OVERRIDE;
-  virtual RejectionReason rejection_reason() const OVERRIDE;
+  virtual State state() const override;
+  virtual bool started() const override;
+  virtual RejectionReason rejection_reason() const override;
   virtual scoped_ptr<ChannelAuthenticator>
-      CreateChannelAuthenticator() const OVERRIDE;
+      CreateChannelAuthenticator() const override;
 
   // Calls |current_authenticator_| to process |message|, passing the supplied
   // |resume_callback|.
diff --git a/remoting/protocol/negotiating_client_authenticator.h b/remoting/protocol/negotiating_client_authenticator.h
index 05a8b17..c110a85 100644
--- a/remoting/protocol/negotiating_client_authenticator.h
+++ b/remoting/protocol/negotiating_client_authenticator.h
@@ -36,8 +36,8 @@ class NegotiatingClientAuthenticator : public NegotiatingAuthenticatorBase {
 
   // Overriden from Authenticator.
   virtual void ProcessMessage(const buzz::XmlElement* message,
-                              const base::Closure& resume_callback) OVERRIDE;
-  virtual scoped_ptr<buzz::XmlElement> GetNextMessage() OVERRIDE;
+                              const base::Closure& resume_callback) override;
+  virtual scoped_ptr<buzz::XmlElement> GetNextMessage() override;
 
  private:
   // (Asynchronously) creates an authenticator, and stores it in
diff --git a/remoting/protocol/negotiating_host_authenticator.h b/remoting/protocol/negotiating_host_authenticator.h
index cb5b160..8a8217c 100644
--- a/remoting/protocol/negotiating_host_authenticator.h
+++ b/remoting/protocol/negotiating_host_authenticator.h
@@ -47,8 +47,8 @@ class NegotiatingHostAuthenticator : public NegotiatingAuthenticatorBase {
 
   // Overriden from Authenticator.
   virtual void ProcessMessage(const buzz::XmlElement* message,
-                              const base::Closure& resume_callback) OVERRIDE;
-  virtual scoped_ptr<buzz::XmlElement> GetNextMessage() OVERRIDE;
+                              const base::Closure& resume_callback) override;
+  virtual scoped_ptr<buzz::XmlElement> GetNextMessage() override;
 
  private:
   NegotiatingHostAuthenticator(
diff --git a/remoting/protocol/pairing_authenticator_base.h b/remoting/protocol/pairing_authenticator_base.h
index 9e11f7e..6000c45 100644
--- a/remoting/protocol/pairing_authenticator_base.h
+++ b/remoting/protocol/pairing_authenticator_base.h
@@ -42,14 +42,14 @@ class PairingAuthenticatorBase : public Authenticator {
   virtual ~PairingAuthenticatorBase();
 
   // Authenticator interface.
-  virtual State state() const OVERRIDE;
-  virtual bool started() const OVERRIDE;
-  virtual RejectionReason rejection_reason() const OVERRIDE;
+  virtual State state() const override;
+  virtual bool started() const override;
+  virtual RejectionReason rejection_reason() const override;
   virtual void ProcessMessage(const buzz::XmlElement* message,
-                              const base::Closure& resume_callback) OVERRIDE;
-  virtual scoped_ptr<buzz::XmlElement> GetNextMessage() OVERRIDE;
+                              const base::Closure& resume_callback) override;
+  virtual scoped_ptr<buzz::XmlElement> GetNextMessage() override;
   virtual scoped_ptr<ChannelAuthenticator>
-      CreateChannelAuthenticator() const OVERRIDE;
+      CreateChannelAuthenticator() const override;
 
  protected:
   typedef base::Callback<void(scoped_ptr<Authenticator> authenticator)>
diff --git a/remoting/protocol/pairing_client_authenticator.h b/remoting/protocol/pairing_client_authenticator.h
index 21f96e2..5b0cf5d 100644
--- a/remoting/protocol/pairing_client_authenticator.h
+++ b/remoting/protocol/pairing_client_authenticator.h
@@ -24,8 +24,8 @@ class PairingClientAuthenticator : public PairingAuthenticatorBase {
   // PairingAuthenticatorBase interface.
   virtual void CreateV2AuthenticatorWithPIN(
       State initial_state,
-      const SetAuthenticatorCallback& callback) OVERRIDE;
-  virtual void AddPairingElements(buzz::XmlElement* message) OVERRIDE;
+      const SetAuthenticatorCallback& callback) override;
+  virtual void AddPairingElements(buzz::XmlElement* message) override;
 
   void OnPinFetched(State initial_state,
                     const SetAuthenticatorCallback& callback,
diff --git a/remoting/protocol/pairing_host_authenticator.h b/remoting/protocol/pairing_host_authenticator.h
index 57c900c..619b900 100644
--- a/remoting/protocol/pairing_host_authenticator.h
+++ b/remoting/protocol/pairing_host_authenticator.h
@@ -27,17 +27,17 @@ class PairingHostAuthenticator : public PairingAuthenticatorBase {
   virtual ~PairingHostAuthenticator();
 
   // Authenticator interface.
-  virtual State state() const OVERRIDE;
-  virtual RejectionReason rejection_reason() const OVERRIDE;
+  virtual State state() const override;
+  virtual RejectionReason rejection_reason() const override;
   virtual void ProcessMessage(const buzz::XmlElement* message,
-                              const base::Closure& resume_callback) OVERRIDE;
+                              const base::Closure& resume_callback) override;
 
  private:
   // PairingAuthenticatorBase interface.
   virtual void CreateV2AuthenticatorWithPIN(
       State initial_state,
-      const SetAuthenticatorCallback& callback) OVERRIDE;
-  virtual void AddPairingElements(buzz::XmlElement* message) OVERRIDE;
+      const SetAuthenticatorCallback& callback) override;
+  virtual void AddPairingElements(buzz::XmlElement* message) override;
 
   // Continue processing a protocol message once the pairing information for
   // the client id has been received.
diff --git a/remoting/protocol/pairing_registry_unittest.cc b/remoting/protocol/pairing_registry_unittest.cc
index f713e4c..38db5db 100644
--- a/remoting/protocol/pairing_registry_unittest.cc
+++ b/remoting/protocol/pairing_registry_unittest.cc
@@ -62,7 +62,7 @@ namespace protocol {
 
 class PairingRegistryTest : public testing::Test {
  public:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     callback_count_ = 0;
   }
 
diff --git a/remoting/protocol/protocol_mock_objects.h b/remoting/protocol/protocol_mock_objects.h
index fc51ac7..1b3f7c9 100644
--- a/remoting/protocol/protocol_mock_objects.h
+++ b/remoting/protocol/protocol_mock_objects.h
@@ -221,12 +221,12 @@ class MockPairingRegistryDelegate : public PairingRegistry::Delegate {
   virtual ~MockPairingRegistryDelegate();
 
   // PairingRegistry::Delegate implementation.
-  virtual scoped_ptr<base::ListValue> LoadAll() OVERRIDE;
-  virtual bool DeleteAll() OVERRIDE;
+  virtual scoped_ptr<base::ListValue> LoadAll() override;
+  virtual bool DeleteAll() override;
   virtual protocol::PairingRegistry::Pairing Load(
-      const std::string& client_id) OVERRIDE;
-  virtual bool Save(const protocol::PairingRegistry::Pairing& pairing) OVERRIDE;
-  virtual bool Delete(const std::string& client_id) OVERRIDE;
+      const std::string& client_id) override;
+  virtual bool Save(const protocol::PairingRegistry::Pairing& pairing) override;
+  virtual bool Delete(const std::string& client_id) override;
 
  private:
   typedef std::map<std::string, protocol::PairingRegistry::Pairing> Pairings;
@@ -244,7 +244,7 @@ class SynchronousPairingRegistry : public PairingRegistry {
   virtual void PostTask(
       const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
       const tracked_objects::Location& from_here,
-      const base::Closure& task) OVERRIDE;
+      const base::Closure& task) override;
 };
 
 }  // namespace protocol
diff --git a/remoting/protocol/pseudotcp_channel_factory.h b/remoting/protocol/pseudotcp_channel_factory.h
index 701b5d7..d79437c 100644
--- a/remoting/protocol/pseudotcp_channel_factory.h
+++ b/remoting/protocol/pseudotcp_channel_factory.h
@@ -26,8 +26,8 @@ class PseudoTcpChannelFactory : public StreamChannelFactory {
 
   // StreamChannelFactory interface.
   virtual void CreateChannel(const std::string& name,
-                             const ChannelCreatedCallback& callback) OVERRIDE;
-  virtual void CancelChannelCreation(const std::string& name) OVERRIDE;
+                             const ChannelCreatedCallback& callback) override;
+  virtual void CancelChannelCreation(const std::string& name) override;
 
  private:
   typedef std::map<std::string, net::StreamSocket*> PendingSocketsMap;
diff --git a/remoting/protocol/secure_channel_factory.h b/remoting/protocol/secure_channel_factory.h
index 8f8e12e..f10ef6f 100644
--- a/remoting/protocol/secure_channel_factory.h
+++ b/remoting/protocol/secure_channel_factory.h
@@ -31,8 +31,8 @@ class SecureChannelFactory : public StreamChannelFactory {
 
   // StreamChannelFactory interface.
   virtual void CreateChannel(const std::string& name,
-                             const ChannelCreatedCallback& callback) OVERRIDE;
-  virtual void CancelChannelCreation(const std::string& name) OVERRIDE;
+                             const ChannelCreatedCallback& callback) override;
+  virtual void CancelChannelCreation(const std::string& name) override;
 
  private:
   typedef std::map<std::string, ChannelAuthenticator*> AuthenticatorMap;
diff --git a/remoting/protocol/ssl_hmac_channel_authenticator.h b/remoting/protocol/ssl_hmac_channel_authenticator.h
index 849dab3..e169076 100644
--- a/remoting/protocol/ssl_hmac_channel_authenticator.h
+++ b/remoting/protocol/ssl_hmac_channel_authenticator.h
@@ -58,7 +58,7 @@ class SslHmacChannelAuthenticator : public ChannelAuthenticator,
   // ChannelAuthenticator interface.
   virtual void SecureAndAuthenticate(
       scoped_ptr<net::StreamSocket> socket,
-      const DoneCallback& done_callback) OVERRIDE;
+      const DoneCallback& done_callback) override;
 
  private:
   SslHmacChannelAuthenticator(const std::string& auth_key);
diff --git a/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc b/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc
index 4749dc0..2f87cd4 100644
--- a/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc
+++ b/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc
@@ -54,7 +54,7 @@ class SslHmacChannelAuthenticatorTest : public testing::Test {
   virtual ~SslHmacChannelAuthenticatorTest() {}
 
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     base::FilePath certs_dir(net::GetTestCertsDirectory());
 
     base::FilePath cert_path = certs_dir.AppendASCII("unittest.selfsigned.der");
diff --git a/remoting/protocol/v2_authenticator.h b/remoting/protocol/v2_authenticator.h
index b52a3e1..6ba3373 100644
--- a/remoting/protocol/v2_authenticator.h
+++ b/remoting/protocol/v2_authenticator.h
@@ -37,14 +37,14 @@ class V2Authenticator : public Authenticator {
   virtual ~V2Authenticator();
 
   // Authenticator interface.
-  virtual State state() const OVERRIDE;
-  virtual bool started() const OVERRIDE;
-  virtual RejectionReason rejection_reason() const OVERRIDE;
+  virtual State state() const override;
+  virtual bool started() const override;
+  virtual RejectionReason rejection_reason() const override;
   virtual void ProcessMessage(const buzz::XmlElement* message,
-                              const base::Closure& resume_callback) OVERRIDE;
-  virtual scoped_ptr<buzz::XmlElement> GetNextMessage() OVERRIDE;
+                              const base::Closure& resume_callback) override;
+  virtual scoped_ptr<buzz::XmlElement> GetNextMessage() override;
   virtual scoped_ptr<ChannelAuthenticator>
-      CreateChannelAuthenticator() const OVERRIDE;
+      CreateChannelAuthenticator() const override;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(V2AuthenticatorTest, InvalidSecret);