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}

262 files changed, 986 insertions, 986 deletions

diff --git a/remoting/base/auto_thread.h b/remoting/base/auto_thread.h
index 82dbfe9..ece3685 100644
--- a/remoting/base/auto_thread.h
+++ b/remoting/base/auto_thread.h
@@ -83,7 +83,7 @@ class AutoThread : base::PlatformThread::Delegate {
   void JoinAndDeleteThread();
 
   // base::PlatformThread::Delegate methods:
-  virtual void ThreadMain() OVERRIDE;
+  virtual void ThreadMain() override;
 
   // Used to pass data to ThreadMain.
   struct StartupData;
diff --git a/remoting/base/auto_thread_task_runner.h b/remoting/base/auto_thread_task_runner.h
index bdd59fb..7c40539 100644
--- a/remoting/base/auto_thread_task_runner.h
+++ b/remoting/base/auto_thread_task_runner.h
@@ -28,12 +28,12 @@ class AutoThreadTaskRunner : public base::SingleThreadTaskRunner {
   virtual bool PostDelayedTask(
       const tracked_objects::Location& from_here,
       const base::Closure& task,
-      base::TimeDelta delay) OVERRIDE;
+      base::TimeDelta delay) override;
   virtual bool PostNonNestableDelayedTask(
       const tracked_objects::Location& from_here,
       const base::Closure& task,
-      base::TimeDelta delay) OVERRIDE;
-  virtual bool RunsTasksOnCurrentThread() const OVERRIDE;
+      base::TimeDelta delay) override;
+  virtual bool RunsTasksOnCurrentThread() const override;
 
  private:
   virtual ~AutoThreadTaskRunner();
diff --git a/remoting/base/auto_thread_unittest.cc b/remoting/base/auto_thread_unittest.cc
index f25f235..1e14cfa 100644
--- a/remoting/base/auto_thread_unittest.cc
+++ b/remoting/base/auto_thread_unittest.cc
@@ -72,14 +72,14 @@ class AutoThreadTest : public testing::Test {
     message_loop_.Run();
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     main_task_runner_ = new AutoThreadTaskRunner(
         message_loop_.message_loop_proxy(),
         base::Bind(&AutoThreadTest::QuitMainMessageLoop,
                    base::Unretained(this)));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     // Verify that |message_loop_| was quit by the AutoThreadTaskRunner.
     EXPECT_TRUE(message_loop_quit_correctly_);
   }
diff --git a/remoting/base/breakpad_win_unittest.cc b/remoting/base/breakpad_win_unittest.cc
index 9f93f78..da554b2 100644
--- a/remoting/base/breakpad_win_unittest.cc
+++ b/remoting/base/breakpad_win_unittest.cc
@@ -71,7 +71,7 @@ class BreakpadWinDeathTest : public testing::Test {
   BreakpadWinDeathTest();
   virtual ~BreakpadWinDeathTest();
 
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
  protected:
   scoped_ptr<google_breakpad::CrashGenerationServer> crash_server_;
diff --git a/remoting/base/compound_buffer.h b/remoting/base/compound_buffer.h
index 227f5fa..c919f88 100644
--- a/remoting/base/compound_buffer.h
+++ b/remoting/base/compound_buffer.h
@@ -108,10 +108,10 @@ class CompoundBufferInputStream
   int position() const { return position_; }
 
   // google::protobuf::io::ZeroCopyInputStream interface.
-  virtual bool Next(const void** data, int* size) OVERRIDE;
-  virtual void BackUp(int count) OVERRIDE;
-  virtual bool Skip(int count) OVERRIDE;
-  virtual int64 ByteCount() const OVERRIDE;
+  virtual bool Next(const void** data, int* size) override;
+  virtual void BackUp(int count) override;
+  virtual bool Skip(int count) override;
+  virtual int64 ByteCount() const override;
 
  private:
   const CompoundBuffer* buffer_;
diff --git a/remoting/base/plugin_thread_task_runner.h b/remoting/base/plugin_thread_task_runner.h
index 0439345..53830ce 100644
--- a/remoting/base/plugin_thread_task_runner.h
+++ b/remoting/base/plugin_thread_task_runner.h
@@ -49,12 +49,12 @@ class PluginThreadTaskRunner : public base::SingleThreadTaskRunner {
   virtual bool PostDelayedTask(
       const tracked_objects::Location& from_here,
       const base::Closure& task,
-      base::TimeDelta delay) OVERRIDE;
+      base::TimeDelta delay) override;
   virtual bool PostNonNestableDelayedTask(
       const tracked_objects::Location& from_here,
       const base::Closure& task,
-      base::TimeDelta delay) OVERRIDE;
-  virtual bool RunsTasksOnCurrentThread() const OVERRIDE;
+      base::TimeDelta delay) override;
+  virtual bool RunsTasksOnCurrentThread() const override;
 
  protected:
   virtual ~PluginThreadTaskRunner();
diff --git a/remoting/base/resources_unittest.cc b/remoting/base/resources_unittest.cc
index 6511967..65b4468 100644
--- a/remoting/base/resources_unittest.cc
+++ b/remoting/base/resources_unittest.cc
@@ -15,11 +15,11 @@ class ResourcesTest : public testing::Test {
   ResourcesTest(): resources_available_(false) {
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     resources_available_ = LoadResources("en-US");
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     UnloadResources();
   }
 
diff --git a/remoting/base/url_request_context_getter.h b/remoting/base/url_request_context_getter.h
index 2cdc8de..d35b021 100644
--- a/remoting/base/url_request_context_getter.h
+++ b/remoting/base/url_request_context_getter.h
@@ -26,9 +26,9 @@ class URLRequestContextGetter : public net::URLRequestContextGetter {
       scoped_refptr<base::SingleThreadTaskRunner> file_task_runner);
 
   // Overridden from net::URLRequestContextGetter:
-  virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE;
+  virtual net::URLRequestContext* GetURLRequestContext() override;
   virtual scoped_refptr<base::SingleThreadTaskRunner>
-      GetNetworkTaskRunner() const OVERRIDE;
+      GetNetworkTaskRunner() const override;
 
  protected:
   virtual ~URLRequestContextGetter();
diff --git a/remoting/base/vlog_net_log.cc b/remoting/base/vlog_net_log.cc
index aee63b8..086fe33 100644
--- a/remoting/base/vlog_net_log.cc
+++ b/remoting/base/vlog_net_log.cc
@@ -19,7 +19,7 @@ class VlogNetLog::Observer : public net::NetLog::ThreadSafeObserver {
   virtual ~Observer();
 
   // NetLog::ThreadSafeObserver overrides:
-  virtual void OnAddEntry(const net::NetLog::Entry& entry) OVERRIDE;
+  virtual void OnAddEntry(const net::NetLog::Entry& entry) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Observer);
diff --git a/remoting/client/audio_decode_scheduler.h b/remoting/client/audio_decode_scheduler.h
index 95f745d..51d5d58 100644
--- a/remoting/client/audio_decode_scheduler.h
+++ b/remoting/client/audio_decode_scheduler.h
@@ -36,7 +36,7 @@ class AudioDecodeScheduler : public protocol::AudioStub {
 
   // AudioStub implementation.
   virtual void ProcessAudioPacket(scoped_ptr<AudioPacket> packet,
-                                  const base::Closure& done) OVERRIDE;
+                                  const base::Closure& done) override;
 
  private:
   class Core;
diff --git a/remoting/client/audio_player_unittest.cc b/remoting/client/audio_player_unittest.cc
index a4e0ea5..ed478d6f 100644
--- a/remoting/client/audio_player_unittest.cc
+++ b/remoting/client/audio_player_unittest.cc
@@ -29,11 +29,11 @@ class FakeAudioPlayer : public AudioPlayer {
   FakeAudioPlayer() {
   }
 
-  virtual bool ResetAudioPlayer(AudioPacket::SamplingRate) OVERRIDE {
+  virtual bool ResetAudioPlayer(AudioPacket::SamplingRate) override {
     return true;
   }
 
-  virtual uint32 GetSamplesPerFrame() OVERRIDE {
+  virtual uint32 GetSamplesPerFrame() override {
     return kAudioSamplesPerFrame;
   }
 };
diff --git a/remoting/client/chromoting_client.h b/remoting/client/chromoting_client.h
index e164d7c..a0088f5 100644
--- a/remoting/client/chromoting_client.h
+++ b/remoting/client/chromoting_client.h
@@ -72,27 +72,27 @@ class ChromotingClient : public protocol::ConnectionToHost::HostEventCallback,
 
   // ClientStub implementation.
   virtual void SetCapabilities(
-      const protocol::Capabilities& capabilities) OVERRIDE;
+      const protocol::Capabilities& capabilities) override;
   virtual void SetPairingResponse(
-      const protocol::PairingResponse& pairing_response) OVERRIDE;
+      const protocol::PairingResponse& pairing_response) override;
   virtual void DeliverHostMessage(
-      const protocol::ExtensionMessage& message) OVERRIDE;
+      const protocol::ExtensionMessage& message) override;
 
   // ClipboardStub implementation for receiving clipboard data from host.
   virtual void InjectClipboardEvent(
-      const protocol::ClipboardEvent& event) OVERRIDE;
+      const protocol::ClipboardEvent& event) override;
 
   // CursorShapeStub implementation for receiving cursor shape updates.
   virtual void SetCursorShape(
-      const protocol::CursorShapeInfo& cursor_shape) OVERRIDE;
+      const protocol::CursorShapeInfo& cursor_shape) override;
 
   // ConnectionToHost::HostEventCallback implementation.
   virtual void OnConnectionState(
       protocol::ConnectionToHost::State state,
-      protocol::ErrorCode error) OVERRIDE;
-  virtual void OnConnectionReady(bool ready) OVERRIDE;
+      protocol::ErrorCode error) override;
+  virtual void OnConnectionReady(bool ready) override;
   virtual void OnRouteChanged(const std::string& channel_name,
-                              const protocol::TransportRoute& route) OVERRIDE;
+                              const protocol::TransportRoute& route) override;
 
  private:
   // Called when the connection is authenticated.
diff --git a/remoting/client/client_status_logger_unittest.cc b/remoting/client/client_status_logger_unittest.cc
index 695b455..26c56d0 100644
--- a/remoting/client/client_status_logger_unittest.cc
+++ b/remoting/client/client_status_logger_unittest.cc
@@ -65,7 +65,7 @@ MATCHER(IsStatisticsLog, "") {
 class ClientStatusLoggerTest : public testing::Test {
  public:
   ClientStatusLoggerTest() {}
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     EXPECT_CALL(signal_strategy_, AddListener(_));
     EXPECT_CALL(signal_strategy_, RemoveListener(_));
     message_loop_proxy_ = base::MessageLoopProxy::current();
diff --git a/remoting/client/frame_consumer_proxy.h b/remoting/client/frame_consumer_proxy.h
index b42bab5..3b273bb 100644
--- a/remoting/client/frame_consumer_proxy.h
+++ b/remoting/client/frame_consumer_proxy.h
@@ -34,11 +34,11 @@ class FrameConsumerProxy
                            const webrtc::DesktopRect& clip_area,
                            webrtc::DesktopFrame* buffer,
                            const webrtc::DesktopRegion& region,
-                           const webrtc::DesktopRegion& shape) OVERRIDE;
-  virtual void ReturnBuffer(webrtc::DesktopFrame* buffer) OVERRIDE;
+                           const webrtc::DesktopRegion& shape) override;
+  virtual void ReturnBuffer(webrtc::DesktopFrame* buffer) override;
   virtual void SetSourceSize(const webrtc::DesktopSize& source_size,
-                             const webrtc::DesktopVector& dpi) OVERRIDE;
-  virtual PixelFormat GetPixelFormat() OVERRIDE;
+                             const webrtc::DesktopVector& dpi) override;
+  virtual PixelFormat GetPixelFormat() override;
 
  private:
   friend class base::RefCountedThreadSafe<FrameConsumerProxy>;
diff --git a/remoting/client/jni/chromoting_jni_instance.h b/remoting/client/jni/chromoting_jni_instance.h
index ce572fc..204525f 100644
--- a/remoting/client/jni/chromoting_jni_instance.h
+++ b/remoting/client/jni/chromoting_jni_instance.h
@@ -96,24 +96,24 @@ class ChromotingJniInstance
   // ClientUserInterface implementation.
   virtual void OnConnectionState(
       protocol::ConnectionToHost::State state,
-      protocol::ErrorCode error) OVERRIDE;
-  virtual void OnConnectionReady(bool ready) OVERRIDE;
+      protocol::ErrorCode error) override;
+  virtual void OnConnectionReady(bool ready) override;
   virtual void OnRouteChanged(const std::string& channel_name,
-                              const protocol::TransportRoute& route) OVERRIDE;
-  virtual void SetCapabilities(const std::string& capabilities) OVERRIDE;
+                              const protocol::TransportRoute& route) override;
+  virtual void SetCapabilities(const std::string& capabilities) override;
   virtual void SetPairingResponse(
-      const protocol::PairingResponse& response) OVERRIDE;
+      const protocol::PairingResponse& response) override;
   virtual void DeliverHostMessage(
-      const protocol::ExtensionMessage& message) OVERRIDE;
-  virtual protocol::ClipboardStub* GetClipboardStub() OVERRIDE;
-  virtual protocol::CursorShapeStub* GetCursorShapeStub() OVERRIDE;
+      const protocol::ExtensionMessage& message) override;
+  virtual protocol::ClipboardStub* GetClipboardStub() override;
+  virtual protocol::CursorShapeStub* GetCursorShapeStub() override;
 
   // CursorShapeStub implementation.
   virtual void InjectClipboardEvent(
-      const protocol::ClipboardEvent& event) OVERRIDE;
+      const protocol::ClipboardEvent& event) override;
 
   // ClipboardStub implementation.
-  virtual void SetCursorShape(const protocol::CursorShapeInfo& shape) OVERRIDE;
+  virtual void SetCursorShape(const protocol::CursorShapeInfo& shape) override;
 
  private:
   // This object is ref-counted, so it cleans itself up.
diff --git a/remoting/client/jni/jni_frame_consumer.h b/remoting/client/jni/jni_frame_consumer.h
index 92e9089..3368a98 100644
--- a/remoting/client/jni/jni_frame_consumer.h
+++ b/remoting/client/jni/jni_frame_consumer.h
@@ -44,11 +44,11 @@ class JniFrameConsumer : public FrameConsumer {
                            const webrtc::DesktopRect& clip_area,
                            webrtc::DesktopFrame* buffer,
                            const webrtc::DesktopRegion& region,
-                           const webrtc::DesktopRegion& shape) OVERRIDE;
-  virtual void ReturnBuffer(webrtc::DesktopFrame* buffer) OVERRIDE;
+                           const webrtc::DesktopRegion& shape) override;
+  virtual void ReturnBuffer(webrtc::DesktopFrame* buffer) override;
   virtual void SetSourceSize(const webrtc::DesktopSize& source_size,
-                             const webrtc::DesktopVector& dpi) OVERRIDE;
-  virtual PixelFormat GetPixelFormat() OVERRIDE;
+                             const webrtc::DesktopVector& dpi) override;
+  virtual PixelFormat GetPixelFormat() override;
 
  private:
   // Allocates a new buffer of |source_size|, informs Java about it, and tells
diff --git a/remoting/client/key_event_mapper.h b/remoting/client/key_event_mapper.h
index 69e0969..51f3afc 100644
--- a/remoting/client/key_event_mapper.h
+++ b/remoting/client/key_event_mapper.h
@@ -39,7 +39,7 @@ class KeyEventMapper : public protocol::InputFilter {
   void RemapKey(uint32 in_usb_keycode, uint32 out_usb_keycode);
 
   // InputFilter overrides.
-  virtual void InjectKeyEvent(const protocol::KeyEvent& event) OVERRIDE;
+  virtual void InjectKeyEvent(const protocol::KeyEvent& event) override;
 
  private:
   std::map<uint32,uint32> mapped_keys;
diff --git a/remoting/client/plugin/chromoting_instance.h b/remoting/client/plugin/chromoting_instance.h
index 36bba6a..bd4e7c4 100644
--- a/remoting/client/plugin/chromoting_instance.h
+++ b/remoting/client/plugin/chromoting_instance.h
@@ -107,34 +107,34 @@ class ChromotingInstance :
   virtual ~ChromotingInstance();
 
   // pp::Instance interface.
-  virtual void DidChangeFocus(bool has_focus) OVERRIDE;
-  virtual void DidChangeView(const pp::View& view) OVERRIDE;
+  virtual void DidChangeFocus(bool has_focus) override;
+  virtual void DidChangeView(const pp::View& view) override;
   virtual bool Init(uint32_t argc, const char* argn[],
-                    const char* argv[]) OVERRIDE;
-  virtual void HandleMessage(const pp::Var& message) OVERRIDE;
-  virtual bool HandleInputEvent(const pp::InputEvent& event) OVERRIDE;
+                    const char* argv[]) override;
+  virtual void HandleMessage(const pp::Var& message) override;
+  virtual bool HandleInputEvent(const pp::InputEvent& event) override;
 
   // ClientUserInterface interface.
   virtual void OnConnectionState(protocol::ConnectionToHost::State state,
-                                 protocol::ErrorCode error) OVERRIDE;
-  virtual void OnConnectionReady(bool ready) OVERRIDE;
+                                 protocol::ErrorCode error) override;
+  virtual void OnConnectionReady(bool ready) override;
   virtual void OnRouteChanged(const std::string& channel_name,
-                              const protocol::TransportRoute& route) OVERRIDE;
-  virtual void SetCapabilities(const std::string& capabilities) OVERRIDE;
+                              const protocol::TransportRoute& route) override;
+  virtual void SetCapabilities(const std::string& capabilities) override;
   virtual void SetPairingResponse(
-      const protocol::PairingResponse& pairing_response) OVERRIDE;
+      const protocol::PairingResponse& pairing_response) override;
   virtual void DeliverHostMessage(
-      const protocol::ExtensionMessage& message) OVERRIDE;
-  virtual protocol::ClipboardStub* GetClipboardStub() OVERRIDE;
-  virtual protocol::CursorShapeStub* GetCursorShapeStub() OVERRIDE;
+      const protocol::ExtensionMessage& message) override;
+  virtual protocol::ClipboardStub* GetClipboardStub() override;
+  virtual protocol::CursorShapeStub* GetCursorShapeStub() override;
 
   // protocol::ClipboardStub interface.
   virtual void InjectClipboardEvent(
-      const protocol::ClipboardEvent& event) OVERRIDE;
+      const protocol::ClipboardEvent& event) override;
 
   // protocol::CursorShapeStub interface.
   virtual void SetCursorShape(
-      const protocol::CursorShapeInfo& cursor_shape) OVERRIDE;
+      const protocol::CursorShapeInfo& cursor_shape) override;
 
   // Called by PepperView.
   void SetDesktopSize(const webrtc::DesktopSize& size,
@@ -245,11 +245,11 @@ class ChromotingInstance :
 
   // MediaSourceVideoRenderer::Delegate implementation.
   virtual void OnMediaSourceSize(const webrtc::DesktopSize& size,
-                                 const webrtc::DesktopVector& dpi) OVERRIDE;
-  virtual void OnMediaSourceShape(const webrtc::DesktopRegion& shape) OVERRIDE;
-  virtual void OnMediaSourceReset(const std::string& format) OVERRIDE;
+                                 const webrtc::DesktopVector& dpi) override;
+  virtual void OnMediaSourceShape(const webrtc::DesktopRegion& shape) override;
+  virtual void OnMediaSourceReset(const std::string& format) override;
   virtual void OnMediaSourceData(uint8_t* buffer, size_t buffer_size,
-                                 bool keyframe) OVERRIDE;
+                                 bool keyframe) override;
 
   bool initialized_;
 
diff --git a/remoting/client/plugin/delegating_signal_strategy.h b/remoting/client/plugin/delegating_signal_strategy.h
index 289ca5b..e78a47c 100644
--- a/remoting/client/plugin/delegating_signal_strategy.h
+++ b/remoting/client/plugin/delegating_signal_strategy.h
@@ -26,15 +26,15 @@ class DelegatingSignalStrategy : public SignalStrategy {
   void OnIncomingMessage(const std::string& message);
 
   // SignalStrategy interface.
-  virtual void Connect() OVERRIDE;
-  virtual void Disconnect() OVERRIDE;
-  virtual State GetState() const OVERRIDE;
-  virtual Error GetError() const OVERRIDE;
-  virtual std::string GetLocalJid() const OVERRIDE;
-  virtual void AddListener(Listener* listener) OVERRIDE;
-  virtual void RemoveListener(Listener* listener) OVERRIDE;
-  virtual bool SendStanza(scoped_ptr<buzz::XmlElement> stanza) OVERRIDE;
-  virtual std::string GetNextId() OVERRIDE;
+  virtual void Connect() override;
+  virtual void Disconnect() override;
+  virtual State GetState() const override;
+  virtual Error GetError() const override;
+  virtual std::string GetLocalJid() const override;
+  virtual void AddListener(Listener* listener) override;
+  virtual void RemoveListener(Listener* listener) override;
+  virtual bool SendStanza(scoped_ptr<buzz::XmlElement> stanza) override;
+  virtual std::string GetNextId() override;
 
  private:
   std::string local_jid_;
diff --git a/remoting/client/plugin/media_source_video_renderer.cc b/remoting/client/plugin/media_source_video_renderer.cc
index 78fd219..e6d21b8 100644
--- a/remoting/client/plugin/media_source_video_renderer.cc
+++ b/remoting/client/plugin/media_source_video_renderer.cc
@@ -28,12 +28,12 @@ class MediaSourceVideoRenderer::VideoWriter : public mkvmuxer::IMkvWriter {
   int64_t last_frame_timestamp() { return timecode_ - kFrameIntervalNs; }
 
   // IMkvWriter interface.
-  virtual mkvmuxer::int32 Write(const void* buf, mkvmuxer::uint32 len) OVERRIDE;
-  virtual mkvmuxer::int64 Position() const OVERRIDE;
-  virtual mkvmuxer::int32 Position(mkvmuxer::int64 position) OVERRIDE;
-  virtual bool Seekable() const OVERRIDE;
+  virtual mkvmuxer::int32 Write(const void* buf, mkvmuxer::uint32 len) override;
+  virtual mkvmuxer::int64 Position() const override;
+  virtual mkvmuxer::int32 Position(mkvmuxer::int64 position) override;
+  virtual bool Seekable() const override;
   virtual void ElementStartNotify(mkvmuxer::uint64 element_id,
-                                  mkvmuxer::int64 position) OVERRIDE;
+                                  mkvmuxer::int64 position) override;
 
   scoped_ptr<DataBuffer> OnVideoFrame(const std::string& video_data,
                                       bool keyframe);
diff --git a/remoting/client/plugin/media_source_video_renderer.h b/remoting/client/plugin/media_source_video_renderer.h
index 1a5623d..c8c260bb 100644
--- a/remoting/client/plugin/media_source_video_renderer.h
+++ b/remoting/client/plugin/media_source_video_renderer.h
@@ -46,10 +46,10 @@ class MediaSourceVideoRenderer : public VideoRenderer {
   virtual ~MediaSourceVideoRenderer();
 
   // VideoRenderer interface.
-  virtual void Initialize(const protocol::SessionConfig& config) OVERRIDE;
-  virtual ChromotingStats* GetStats() OVERRIDE;
+  virtual void Initialize(const protocol::SessionConfig& config) override;
+  virtual ChromotingStats* GetStats() override;
   virtual void ProcessVideoPacket(scoped_ptr<VideoPacket> packet,
-                                  const base::Closure& done) OVERRIDE;
+                                  const base::Closure& done) override;
 
  private:
   // Helper class used to generate WebM stream.
diff --git a/remoting/client/plugin/normalizing_input_filter_cros.h b/remoting/client/plugin/normalizing_input_filter_cros.h
index 977c90c..73c919a 100644
--- a/remoting/client/plugin/normalizing_input_filter_cros.h
+++ b/remoting/client/plugin/normalizing_input_filter_cros.h
@@ -26,8 +26,8 @@ class NormalizingInputFilterCros : public protocol::InputFilter {
   virtual ~NormalizingInputFilterCros();
 
   // InputFilter overrides.
-  virtual void InjectKeyEvent(const protocol::KeyEvent& event) OVERRIDE;
-  virtual void InjectMouseEvent(const protocol::MouseEvent& event) OVERRIDE;
+  virtual void InjectKeyEvent(const protocol::KeyEvent& event) override;
+  virtual void InjectMouseEvent(const protocol::MouseEvent& event) override;
 
  private:
   void ProcessKeyDown(const protocol::KeyEvent& event);
diff --git a/remoting/client/plugin/normalizing_input_filter_mac.h b/remoting/client/plugin/normalizing_input_filter_mac.h
index ed1d0d3..5e33911 100644
--- a/remoting/client/plugin/normalizing_input_filter_mac.h
+++ b/remoting/client/plugin/normalizing_input_filter_mac.h
@@ -48,7 +48,7 @@ class NormalizingInputFilterMac : public protocol::InputFilter {
   virtual ~NormalizingInputFilterMac();
 
   // InputFilter overrides.
-  virtual void InjectKeyEvent(const protocol::KeyEvent& event) OVERRIDE;
+  virtual void InjectKeyEvent(const protocol::KeyEvent& event) override;
 
  private:
   typedef std::map<int, protocol::KeyEvent> KeyPressedMap;
diff --git a/remoting/client/plugin/pepper_address_resolver.h b/remoting/client/plugin/pepper_address_resolver.h
index 37012ea..42e61b6 100644
--- a/remoting/client/plugin/pepper_address_resolver.h
+++ b/remoting/client/plugin/pepper_address_resolver.h
@@ -19,11 +19,11 @@ class PepperAddressResolver : public rtc::AsyncResolverInterface {
   virtual ~PepperAddressResolver();
 
   // rtc::AsyncResolverInterface.
-  virtual void Start(const rtc::SocketAddress& addr) OVERRIDE;
+  virtual void Start(const rtc::SocketAddress& addr) override;
   virtual bool GetResolvedAddress(int family,
-                                  rtc::SocketAddress* addr) const OVERRIDE;
-  virtual int GetError() const OVERRIDE;
-  virtual void Destroy(bool wait) OVERRIDE;
+                                  rtc::SocketAddress* addr) const override;
+  virtual int GetError() const override;
+  virtual void Destroy(bool wait) override;
 
  private:
   void OnResolved(int32_t result);
diff --git a/remoting/client/plugin/pepper_audio_player.h b/remoting/client/plugin/pepper_audio_player.h
index fc8bbcd..f86075b 100644
--- a/remoting/client/plugin/pepper_audio_player.h
+++ b/remoting/client/plugin/pepper_audio_player.h
@@ -18,10 +18,10 @@ class PepperAudioPlayer : public AudioPlayer {
   explicit PepperAudioPlayer(pp::Instance* instance);
   virtual ~PepperAudioPlayer();
 
-  virtual uint32 GetSamplesPerFrame() OVERRIDE;
+  virtual uint32 GetSamplesPerFrame() override;
 
   virtual bool ResetAudioPlayer(AudioPacket::SamplingRate sampling_rate)
-      OVERRIDE;
+      override;
 
  private:
   pp::Instance* instance_;
diff --git a/remoting/client/plugin/pepper_entrypoints.cc b/remoting/client/plugin/pepper_entrypoints.cc
index 7cd5bf1..b40f90e 100644
--- a/remoting/client/plugin/pepper_entrypoints.cc
+++ b/remoting/client/plugin/pepper_entrypoints.cc
@@ -18,7 +18,7 @@ namespace remoting {
 
 class ChromotingModule : public pp::Module {
  protected:
-  virtual ChromotingInstance* CreateInstance(PP_Instance instance) OVERRIDE {
+  virtual ChromotingInstance* CreateInstance(PP_Instance instance) override {
     return new ChromotingInstance(instance);
   }
 };
diff --git a/remoting/client/plugin/pepper_input_handler.h b/remoting/client/plugin/pepper_input_handler.h
index 9ec0475..cacfd9d 100644
--- a/remoting/client/plugin/pepper_input_handler.h
+++ b/remoting/client/plugin/pepper_input_handler.h
@@ -64,7 +64,7 @@ class PepperInputHandler : public pp::MouseLock {
   };
 
   // pp::MouseLock interface.
-  virtual void MouseLockLost() OVERRIDE;
+  virtual void MouseLockLost() override;
 
   // Requests the browser to lock the mouse and hides the cursor.
   void RequestMouseLock();
diff --git a/remoting/client/plugin/pepper_module.cc b/remoting/client/plugin/pepper_module.cc
index b8e3bc5..557a70d 100644
--- a/remoting/client/plugin/pepper_module.cc
+++ b/remoting/client/plugin/pepper_module.cc
@@ -12,7 +12,7 @@ namespace remoting {
 
 class ChromotingModule : public pp::Module {
  protected:
-  virtual pp::Instance* CreateInstance(PP_Instance instance) OVERRIDE {
+  virtual pp::Instance* CreateInstance(PP_Instance instance) override {
     pp::Instance* result = new ChromotingInstance(instance);
     return result;
   }
diff --git a/remoting/client/plugin/pepper_network_manager.h b/remoting/client/plugin/pepper_network_manager.h
index 639fb74..4525522 100644
--- a/remoting/client/plugin/pepper_network_manager.h
+++ b/remoting/client/plugin/pepper_network_manager.h
@@ -27,8 +27,8 @@ class PepperNetworkManager : public rtc::NetworkManagerBase {
   virtual ~PepperNetworkManager();
 
   // NetworkManager interface.
-  virtual void StartUpdating() OVERRIDE;
-  virtual void StopUpdating() OVERRIDE;
+  virtual void StartUpdating() override;
+  virtual void StopUpdating() override;
 
  private:
   static void OnNetworkListCallbackHandler(void* user_data,
diff --git a/remoting/client/plugin/pepper_packet_socket_factory.cc b/remoting/client/plugin/pepper_packet_socket_factory.cc
index 01a20a3..713973e 100644
--- a/remoting/client/plugin/pepper_packet_socket_factory.cc
+++ b/remoting/client/plugin/pepper_packet_socket_factory.cc
@@ -95,20 +95,20 @@ class UdpPacketSocket : public rtc::AsyncPacketSocket {
             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 opt, int* value) OVERRIDE;
-  virtual int SetOption(rtc::Socket::Option opt, 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 opt, int* value) override;
+  virtual int SetOption(rtc::Socket::Option opt, int value) override;
+  virtual int GetError() const override;
+  virtual void SetError(int error) override;
 
  private:
   struct PendingPacket {
diff --git a/remoting/client/plugin/pepper_packet_socket_factory.h b/remoting/client/plugin/pepper_packet_socket_factory.h
index de7aa6c..1cd15e7 100644
--- a/remoting/client/plugin/pepper_packet_socket_factory.h
+++ b/remoting/client/plugin/pepper_packet_socket_factory.h
@@ -18,19 +18,19 @@ class PepperPacketSocketFactory : 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:
   const pp::InstanceHandle pp_instance_;
diff --git a/remoting/client/plugin/pepper_plugin_thread_delegate.h b/remoting/client/plugin/pepper_plugin_thread_delegate.h
index 114a460..aa3ce33 100644
--- a/remoting/client/plugin/pepper_plugin_thread_delegate.h
+++ b/remoting/client/plugin/pepper_plugin_thread_delegate.h
@@ -19,7 +19,7 @@ class PepperPluginThreadDelegate : public PluginThreadTaskRunner::Delegate {
   virtual ~PepperPluginThreadDelegate();
 
   virtual bool RunOnPluginThread(
-      base::TimeDelta delay, void(CDECL function)(void*), void* data) OVERRIDE;
+      base::TimeDelta delay, void(CDECL function)(void*), void* data) override;
 
  private:
   pp::Core* core_;
diff --git a/remoting/client/plugin/pepper_port_allocator.cc b/remoting/client/plugin/pepper_port_allocator.cc
index db47a62..e03d050 100644
--- a/remoting/client/plugin/pepper_port_allocator.cc
+++ b/remoting/client/plugin/pepper_port_allocator.cc
@@ -40,9 +40,9 @@ class PepperPortAllocatorSession
   virtual ~PepperPortAllocatorSession();
 
   // cricket::HttpPortAllocatorBase overrides.
-  virtual void ConfigReady(cricket::PortConfiguration* config) OVERRIDE;
-  virtual void GetPortConfigurations() OVERRIDE;
-  virtual void SendSessionRequest(const std::string& host, int port) OVERRIDE;
+  virtual void ConfigReady(cricket::PortConfiguration* config) override;
+  virtual void GetPortConfigurations() override;
+  virtual void SendSessionRequest(const std::string& host, int port) override;
 
  private:
   void OnUrlOpened(int32_t result);
diff --git a/remoting/client/plugin/pepper_port_allocator.h b/remoting/client/plugin/pepper_port_allocator.h
index 5c46a4b..37887a7 100644
--- a/remoting/client/plugin/pepper_port_allocator.h
+++ b/remoting/client/plugin/pepper_port_allocator.h
@@ -32,7 +32,7 @@ class PepperPortAllocator : 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:
   PepperPortAllocator(
diff --git a/remoting/client/plugin/pepper_view.h b/remoting/client/plugin/pepper_view.h
index 098ab68..37f3a89 100644
--- a/remoting/client/plugin/pepper_view.h
+++ b/remoting/client/plugin/pepper_view.h
@@ -49,11 +49,11 @@ class PepperView : public FrameConsumer {
                            const webrtc::DesktopRect& clip_area,
                            webrtc::DesktopFrame* buffer,
                            const webrtc::DesktopRegion& region,
-                           const webrtc::DesktopRegion& shape) OVERRIDE;
-  virtual void ReturnBuffer(webrtc::DesktopFrame* buffer) OVERRIDE;
+                           const webrtc::DesktopRegion& shape) override;
+  virtual void ReturnBuffer(webrtc::DesktopFrame* buffer) override;
   virtual void SetSourceSize(const webrtc::DesktopSize& source_size,
-                             const webrtc::DesktopVector& dpi) OVERRIDE;
-  virtual PixelFormat GetPixelFormat() OVERRIDE;
+                             const webrtc::DesktopVector& dpi) override;
+  virtual PixelFormat GetPixelFormat() override;
 
   // Updates the PepperView's size & clipping area, taking into account the
   // DIP-to-device scale factor.
diff --git a/remoting/client/software_video_renderer.cc b/remoting/client/software_video_renderer.cc
index 4d95e13..23049fc 100644
--- a/remoting/client/software_video_renderer.cc
+++ b/remoting/client/software_video_renderer.cc
@@ -37,16 +37,16 @@ class RgbToBgrVideoDecoderFilter : public VideoDecoder {
       : parent_(parent.Pass()) {
   }
 
-  virtual void Initialize(const webrtc::DesktopSize& screen_size) OVERRIDE {
+  virtual void Initialize(const webrtc::DesktopSize& screen_size) override {
     parent_->Initialize(screen_size);
   }
 
-  virtual bool DecodePacket(const VideoPacket& packet) OVERRIDE {
+  virtual bool DecodePacket(const VideoPacket& packet) override {
     return parent_->DecodePacket(packet);
   }
 
   virtual void Invalidate(const webrtc::DesktopSize& view_size,
-                          const webrtc::DesktopRegion& region) OVERRIDE {
+                          const webrtc::DesktopRegion& region) override {
     return parent_->Invalidate(view_size, region);
   }
 
@@ -54,7 +54,7 @@ class RgbToBgrVideoDecoderFilter : public VideoDecoder {
                            const webrtc::DesktopRect& clip_area,
                            uint8* image_buffer,
                            int image_stride,
-                           webrtc::DesktopRegion* output_region) OVERRIDE {
+                           webrtc::DesktopRegion* output_region) override {
     parent_->RenderFrame(view_size, clip_area, image_buffer, image_stride,
                          output_region);
 
@@ -68,7 +68,7 @@ class RgbToBgrVideoDecoderFilter : public VideoDecoder {
     }
   }
 
-  virtual const webrtc::DesktopRegion* GetImageShape() OVERRIDE {
+  virtual const webrtc::DesktopRegion* GetImageShape() override {
     return parent_->GetImageShape();
   }
 
diff --git a/remoting/client/software_video_renderer.h b/remoting/client/software_video_renderer.h
index f03f3e6..ee05d11 100644
--- a/remoting/client/software_video_renderer.h
+++ b/remoting/client/software_video_renderer.h
@@ -42,10 +42,10 @@ class SoftwareVideoRenderer : public VideoRenderer,
   virtual ~SoftwareVideoRenderer();
 
   // VideoRenderer implementation.
-  virtual void Initialize(const protocol::SessionConfig& config) OVERRIDE;
-  virtual ChromotingStats* GetStats() OVERRIDE;
+  virtual void Initialize(const protocol::SessionConfig& config) override;
+  virtual ChromotingStats* GetStats() override;
   virtual void ProcessVideoPacket(scoped_ptr<VideoPacket> packet,
-                                  const base::Closure& done) OVERRIDE;
+                                  const base::Closure& done) override;
 
   // FrameProducer implementation. These methods may be called before we are
   // Initialize()d, or we know the source screen size. These methods may be
@@ -54,12 +54,12 @@ class SoftwareVideoRenderer : public VideoRenderer,
   // TODO(sergeyu): On Android a separate display thread is used for drawing.
   // FrameConsumer calls FrameProducer on that thread. Can we avoid having a
   // separate display thread? E.g. can we do everything on the decode thread?
-  virtual void DrawBuffer(webrtc::DesktopFrame* buffer) OVERRIDE;
-  virtual void InvalidateRegion(const webrtc::DesktopRegion& region) OVERRIDE;
-  virtual void RequestReturnBuffers(const base::Closure& done) OVERRIDE;
+  virtual void DrawBuffer(webrtc::DesktopFrame* buffer) override;
+  virtual void InvalidateRegion(const webrtc::DesktopRegion& region) override;
+  virtual void RequestReturnBuffers(const base::Closure& done) override;
   virtual void SetOutputSizeAndClip(
       const webrtc::DesktopSize& view_size,
-      const webrtc::DesktopRect& clip_area) OVERRIDE;
+      const webrtc::DesktopRect& clip_area) override;
 
  private:
   class Core;
diff --git a/remoting/client/token_fetcher_proxy.h b/remoting/client/token_fetcher_proxy.h
index f7cec09..708bf81 100644
--- a/remoting/client/token_fetcher_proxy.h
+++ b/remoting/client/token_fetcher_proxy.h
@@ -28,7 +28,7 @@ class TokenFetcherProxy
   virtual void FetchThirdPartyToken(
       const GURL& token_url,
       const std::string& scope,
-      const TokenFetchedCallback& token_fetched_callback) OVERRIDE;
+      const TokenFetchedCallback& token_fetched_callback) override;
 
   // Called by the token fetching implementation when the token is fetched.
   void OnTokenFetched(const std::string& token,
diff --git a/remoting/codec/audio_decoder_opus.h b/remoting/codec/audio_decoder_opus.h
index 35989ea..2c3a527 100644
--- a/remoting/codec/audio_decoder_opus.h
+++ b/remoting/codec/audio_decoder_opus.h
@@ -22,7 +22,7 @@ class AudioDecoderOpus : public AudioDecoder {
 
   // AudioDecoder interface.
   virtual scoped_ptr<AudioPacket> Decode(
-      scoped_ptr<AudioPacket> packet) OVERRIDE;
+      scoped_ptr<AudioPacket> packet) override;
 
  private:
   void InitDecoder();
diff --git a/remoting/codec/audio_decoder_verbatim.h b/remoting/codec/audio_decoder_verbatim.h
index b2d967e..aef5cd9 100644
--- a/remoting/codec/audio_decoder_verbatim.h
+++ b/remoting/codec/audio_decoder_verbatim.h
@@ -20,7 +20,7 @@ class AudioDecoderVerbatim : public AudioDecoder {
   virtual ~AudioDecoderVerbatim();
 
   virtual scoped_ptr<AudioPacket> Decode(
-      scoped_ptr<AudioPacket> packet) OVERRIDE;
+      scoped_ptr<AudioPacket> packet) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AudioDecoderVerbatim);
diff --git a/remoting/codec/audio_encoder_opus.h b/remoting/codec/audio_encoder_opus.h
index 6799836..16be750 100644
--- a/remoting/codec/audio_encoder_opus.h
+++ b/remoting/codec/audio_encoder_opus.h
@@ -27,7 +27,7 @@ class AudioEncoderOpus : public AudioEncoder {
 
   // AudioEncoder interface.
   virtual scoped_ptr<AudioPacket> Encode(
-      scoped_ptr<AudioPacket> packet) OVERRIDE;
+      scoped_ptr<AudioPacket> packet) override;
 
  private:
   void InitEncoder();
diff --git a/remoting/codec/audio_encoder_verbatim.h b/remoting/codec/audio_encoder_verbatim.h
index d3bc9ca..25cd54e 100644
--- a/remoting/codec/audio_encoder_verbatim.h
+++ b/remoting/codec/audio_encoder_verbatim.h
@@ -18,7 +18,7 @@ class AudioEncoderVerbatim : public AudioEncoder {
 
   // AudioEncoder implementation.
   virtual scoped_ptr<AudioPacket> Encode(
-      scoped_ptr<AudioPacket> packet) OVERRIDE;
+      scoped_ptr<AudioPacket> packet) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AudioEncoderVerbatim);
diff --git a/remoting/codec/video_decoder_verbatim.h b/remoting/codec/video_decoder_verbatim.h
index 24203d9..a02b2708 100644
--- a/remoting/codec/video_decoder_verbatim.h
+++ b/remoting/codec/video_decoder_verbatim.h
@@ -23,16 +23,16 @@ class VideoDecoderVerbatim : public VideoDecoder {
   VideoDecoderVerbatim();
 
   // VideoDecoder implementation.
-  virtual void Initialize(const webrtc::DesktopSize& screen_size) OVERRIDE;
-  virtual bool DecodePacket(const VideoPacket& packet) OVERRIDE;
+  virtual void Initialize(const webrtc::DesktopSize& screen_size) override;
+  virtual bool DecodePacket(const VideoPacket& packet) override;
   virtual void Invalidate(const webrtc::DesktopSize& view_size,
-                          const webrtc::DesktopRegion& region) OVERRIDE;
+                          const webrtc::DesktopRegion& region) override;
   virtual void RenderFrame(const webrtc::DesktopSize& view_size,
                            const webrtc::DesktopRect& clip_area,
                            uint8* image_buffer,
                            int image_stride,
-                           webrtc::DesktopRegion* output_region) OVERRIDE;
-  virtual const webrtc::DesktopRegion* GetImageShape() OVERRIDE;
+                           webrtc::DesktopRegion* output_region) override;
+  virtual const webrtc::DesktopRegion* GetImageShape() override;
 
  private:
   // The region updated that hasn't been copied to the screen yet.
diff --git a/remoting/codec/video_decoder_vpx.h b/remoting/codec/video_decoder_vpx.h
index 3f2fcfb..bbf731c 100644
--- a/remoting/codec/video_decoder_vpx.h
+++ b/remoting/codec/video_decoder_vpx.h
@@ -25,16 +25,16 @@ class VideoDecoderVpx : public VideoDecoder {
   virtual ~VideoDecoderVpx();
 
   // VideoDecoder interface.
-  virtual void Initialize(const webrtc::DesktopSize& screen_size) OVERRIDE;
-  virtual bool DecodePacket(const VideoPacket& packet) OVERRIDE;
+  virtual void Initialize(const webrtc::DesktopSize& screen_size) override;
+  virtual bool DecodePacket(const VideoPacket& packet) override;
   virtual void Invalidate(const webrtc::DesktopSize& view_size,
-                          const webrtc::DesktopRegion& region) OVERRIDE;
+                          const webrtc::DesktopRegion& region) override;
   virtual void RenderFrame(const webrtc::DesktopSize& view_size,
                            const webrtc::DesktopRect& clip_area,
                            uint8* image_buffer,
                            int image_stride,
-                           webrtc::DesktopRegion* output_region) OVERRIDE;
-  virtual const webrtc::DesktopRegion* GetImageShape() OVERRIDE;
+                           webrtc::DesktopRegion* output_region) override;
+  virtual const webrtc::DesktopRegion* GetImageShape() override;
 
  private:
   explicit VideoDecoderVpx(ScopedVpxCodec codec);
diff --git a/remoting/codec/video_encoder_verbatim.h b/remoting/codec/video_encoder_verbatim.h
index 0005a4a..e315c24 100644
--- a/remoting/codec/video_encoder_verbatim.h
+++ b/remoting/codec/video_encoder_verbatim.h
@@ -19,7 +19,7 @@ class VideoEncoderVerbatim : public VideoEncoder {
 
   // VideoEncoder interface.
   virtual scoped_ptr<VideoPacket> Encode(
-      const webrtc::DesktopFrame& frame) OVERRIDE;
+      const webrtc::DesktopFrame& frame) override;
 
  private:
   VideoEncoderHelper helper_;
diff --git a/remoting/codec/video_encoder_vpx.h b/remoting/codec/video_encoder_vpx.h
index 80e69db0..db3ff98 100644
--- a/remoting/codec/video_encoder_vpx.h
+++ b/remoting/codec/video_encoder_vpx.h
@@ -29,10 +29,10 @@ class VideoEncoderVpx : public VideoEncoder {
   virtual ~VideoEncoderVpx();
 
   // VideoEncoder interface.
-  virtual void SetLosslessEncode(bool want_lossless) OVERRIDE;
-  virtual void SetLosslessColor(bool want_lossless) OVERRIDE;
+  virtual void SetLosslessEncode(bool want_lossless) override;
+  virtual void SetLosslessColor(bool want_lossless) override;
   virtual scoped_ptr<VideoPacket> Encode(
-      const webrtc::DesktopFrame& frame) OVERRIDE;
+      const webrtc::DesktopFrame& frame) override;
 
  private:
   explicit VideoEncoderVpx(bool use_vp9);
diff --git a/remoting/host/audio_capturer_linux.h b/remoting/host/audio_capturer_linux.h
index 466ccf6..6f29a1b 100644
--- a/remoting/host/audio_capturer_linux.h
+++ b/remoting/host/audio_capturer_linux.h
@@ -33,12 +33,12 @@ class AudioCapturerLinux : public AudioCapturer,
   virtual ~AudioCapturerLinux();
 
   // AudioCapturer interface.
-  virtual bool Start(const PacketCapturedCallback& callback) OVERRIDE;
-  virtual void Stop() OVERRIDE;
-  virtual bool IsStarted() OVERRIDE;
+  virtual bool Start(const PacketCapturedCallback& callback) override;
+  virtual void Stop() override;
+  virtual bool IsStarted() override;
 
   // AudioPipeReader::StreamObserver interface.
-  virtual void OnDataRead(scoped_refptr<base::RefCountedString> data) OVERRIDE;
+  virtual void OnDataRead(scoped_refptr<base::RefCountedString> data) override;
 
  private:
   scoped_refptr<AudioPipeReader> pipe_reader_;
diff --git a/remoting/host/audio_capturer_win.h b/remoting/host/audio_capturer_win.h
index 1a7ddad..571961c 100644
--- a/remoting/host/audio_capturer_win.h
+++ b/remoting/host/audio_capturer_win.h
@@ -26,9 +26,9 @@ class AudioCapturerWin : public AudioCapturer {
   virtual ~AudioCapturerWin();
 
   // AudioCapturer interface.
-  virtual bool Start(const PacketCapturedCallback& callback) OVERRIDE;
-  virtual void Stop() OVERRIDE;
-  virtual bool IsStarted() OVERRIDE;
+  virtual bool Start(const PacketCapturedCallback& callback) override;
+  virtual void Stop() override;
+  virtual bool IsStarted() override;
 
  private:
   // Receives all packets from the audio capture endpoint buffer and pushes them
diff --git a/remoting/host/basic_desktop_environment.h b/remoting/host/basic_desktop_environment.h
index 543ad90..a5416b2 100644
--- a/remoting/host/basic_desktop_environment.h
+++ b/remoting/host/basic_desktop_environment.h
@@ -30,16 +30,16 @@ class BasicDesktopEnvironment : public DesktopEnvironment {
   virtual ~BasicDesktopEnvironment();
 
   // DesktopEnvironment implementation.
-  virtual scoped_ptr<AudioCapturer> CreateAudioCapturer() OVERRIDE;
-  virtual scoped_ptr<InputInjector> CreateInputInjector() OVERRIDE;
-  virtual scoped_ptr<ScreenControls> CreateScreenControls() OVERRIDE;
-  virtual scoped_ptr<webrtc::DesktopCapturer> CreateVideoCapturer() OVERRIDE;
+  virtual scoped_ptr<AudioCapturer> CreateAudioCapturer() override;
+  virtual scoped_ptr<InputInjector> CreateInputInjector() override;
+  virtual scoped_ptr<ScreenControls> CreateScreenControls() override;
+  virtual scoped_ptr<webrtc::DesktopCapturer> CreateVideoCapturer() override;
   virtual scoped_ptr<webrtc::MouseCursorMonitor> CreateMouseCursorMonitor()
-      OVERRIDE;
-  virtual std::string GetCapabilities() const OVERRIDE;
-  virtual void SetCapabilities(const std::string& capabilities) OVERRIDE;
+      override;
+  virtual std::string GetCapabilities() const override;
+  virtual void SetCapabilities(const std::string& capabilities) override;
   virtual scoped_ptr<GnubbyAuthHandler> CreateGnubbyAuthHandler(
-      protocol::ClientStub* client_stub) OVERRIDE;
+      protocol::ClientStub* client_stub) override;
 
  protected:
   friend class BasicDesktopEnvironmentFactory;
@@ -96,7 +96,7 @@ class BasicDesktopEnvironmentFactory : public DesktopEnvironmentFactory {
   virtual ~BasicDesktopEnvironmentFactory();
 
   // DesktopEnvironmentFactory implementation.
-  virtual bool SupportsAudioCapture() const OVERRIDE;
+  virtual bool SupportsAudioCapture() const override;
 
  protected:
   scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner() const {
diff --git a/remoting/host/cast_extension.h b/remoting/host/cast_extension.h
index f8576b0..b26641f 100644
--- a/remoting/host/cast_extension.h
+++ b/remoting/host/cast_extension.h
@@ -35,10 +35,10 @@ class CastExtension : public HostExtension {
   virtual ~CastExtension();
 
   // HostExtension interface.
-  virtual std::string capability() const OVERRIDE;
+  virtual std::string capability() const override;
   virtual scoped_ptr<HostExtensionSession> CreateExtensionSession(
       ClientSessionControl* client_session_control,
-      protocol::ClientStub* client_stub) OVERRIDE;
+      protocol::ClientStub* client_stub) override;
 
  private:
   scoped_refptr<base::SingleThreadTaskRunner> network_task_runner_;
diff --git a/remoting/host/cast_extension_session.cc b/remoting/host/cast_extension_session.cc
index 76baa85..1976cda 100644
--- a/remoting/host/cast_extension_session.cc
+++ b/remoting/host/cast_extension_session.cc
@@ -71,10 +71,10 @@ class CastSetSessionDescriptionObserver
   static CastSetSessionDescriptionObserver* Create() {
     return new rtc::RefCountedObject<CastSetSessionDescriptionObserver>();
   }
-  virtual void OnSuccess() OVERRIDE {
+  virtual void OnSuccess() override {
     VLOG(1) << "Setting session description succeeded.";
   }
-  virtual void OnFailure(const std::string& error) OVERRIDE {
+  virtual void OnFailure(const std::string& error) override {
     LOG(ERROR) << "Setting session description failed: " << error;
   }
 
@@ -95,7 +95,7 @@ class CastCreateSessionDescriptionObserver
     return new rtc::RefCountedObject<CastCreateSessionDescriptionObserver>(
         session);
   }
-  virtual void OnSuccess(webrtc::SessionDescriptionInterface* desc) OVERRIDE {
+  virtual void OnSuccess(webrtc::SessionDescriptionInterface* desc) override {
     if (cast_extension_session_ == NULL) {
       LOG(ERROR)
           << "No CastExtensionSession. Creating session description succeeded.";
@@ -103,7 +103,7 @@ class CastCreateSessionDescriptionObserver
     }
     cast_extension_session_->OnCreateSessionDescription(desc);
   }
-  virtual void OnFailure(const std::string& error) OVERRIDE {
+  virtual void OnFailure(const std::string& error) override {
     if (cast_extension_session_ == NULL) {
       LOG(ERROR)
           << "No CastExtensionSession. Creating session description failed.";
@@ -135,7 +135,7 @@ class CastStatsObserver : public webrtc::StatsObserver {
   }
 
   virtual void OnComplete(
-      const std::vector<webrtc::StatsReport>& reports) OVERRIDE {
+      const std::vector<webrtc::StatsReport>& reports) override {
     typedef webrtc::StatsReport::Values::iterator ValuesIterator;
 
     VLOG(1) << "Received " << reports.size() << " new StatsReports.";
diff --git a/remoting/host/cast_extension_session.h b/remoting/host/cast_extension_session.h
index 83e477a..fe27280 100644
--- a/remoting/host/cast_extension_session.h
+++ b/remoting/host/cast_extension_session.h
@@ -62,31 +62,31 @@ class CastExtensionSession : public HostExtensionSession,
 
   // HostExtensionSession interface.
   virtual void OnCreateVideoCapturer(
-      scoped_ptr<webrtc::DesktopCapturer>* capturer) OVERRIDE;
-  virtual bool ModifiesVideoPipeline() const OVERRIDE;
+      scoped_ptr<webrtc::DesktopCapturer>* capturer) override;
+  virtual bool ModifiesVideoPipeline() const override;
   virtual bool OnExtensionMessage(
       ClientSessionControl* client_session_control,
       protocol::ClientStub* client_stub,
-      const protocol::ExtensionMessage& message) OVERRIDE;
+      const protocol::ExtensionMessage& message) override;
 
   // webrtc::PeerConnectionObserver interface.
-  virtual void OnError() OVERRIDE;
+  virtual void OnError() override;
   virtual void OnSignalingChange(
-      webrtc::PeerConnectionInterface::SignalingState new_state) OVERRIDE;
+      webrtc::PeerConnectionInterface::SignalingState new_state) override;
   virtual void OnStateChange(
-      webrtc::PeerConnectionObserver::StateType state_changed) OVERRIDE;
-  virtual void OnAddStream(webrtc::MediaStreamInterface* stream) OVERRIDE;
-  virtual void OnRemoveStream(webrtc::MediaStreamInterface* stream) OVERRIDE;
+      webrtc::PeerConnectionObserver::StateType state_changed) override;
+  virtual void OnAddStream(webrtc::MediaStreamInterface* stream) override;
+  virtual void OnRemoveStream(webrtc::MediaStreamInterface* stream) override;
   virtual void OnDataChannel(
-      webrtc::DataChannelInterface* data_channel) OVERRIDE;
-  virtual void OnRenegotiationNeeded() OVERRIDE;
+      webrtc::DataChannelInterface* data_channel) override;
+  virtual void OnRenegotiationNeeded() override;
   virtual void OnIceConnectionChange(
-      webrtc::PeerConnectionInterface::IceConnectionState new_state) OVERRIDE;
+      webrtc::PeerConnectionInterface::IceConnectionState new_state) override;
   virtual void OnIceGatheringChange(
-      webrtc::PeerConnectionInterface::IceGatheringState new_state) OVERRIDE;
+      webrtc::PeerConnectionInterface::IceGatheringState new_state) override;
   virtual void OnIceCandidate(
-      const webrtc::IceCandidateInterface* candidate) OVERRIDE;
-  virtual void OnIceComplete() OVERRIDE;
+      const webrtc::IceCandidateInterface* candidate) override;
+  virtual void OnIceComplete() override;
 
  private:
   CastExtensionSession(
diff --git a/remoting/host/cast_video_capturer_adapter.h b/remoting/host/cast_video_capturer_adapter.h
index 3168859..fd3ab75 100644
--- a/remoting/host/cast_video_capturer_adapter.h
+++ b/remoting/host/cast_video_capturer_adapter.h
@@ -39,21 +39,21 @@ class CastVideoCapturerAdapter : public cricket::VideoCapturer,
   virtual ~CastVideoCapturerAdapter();
 
   // webrtc::DesktopCapturer::Callback implementation.
-  virtual webrtc::SharedMemory* CreateSharedMemory(size_t size) OVERRIDE;
+  virtual webrtc::SharedMemory* CreateSharedMemory(size_t size) override;
   // Converts |frame| to a cricket::CapturedFrame and emits that via
   // SignalFrameCaptured for the base::VideoCapturer implementation to process.
-  virtual void OnCaptureCompleted(webrtc::DesktopFrame* frame) OVERRIDE;
+  virtual void OnCaptureCompleted(webrtc::DesktopFrame* frame) override;
 
   // cricket::VideoCapturer implementation.
   virtual bool GetBestCaptureFormat(const cricket::VideoFormat& desired,
-                                  cricket::VideoFormat* best_format) OVERRIDE;
+                                  cricket::VideoFormat* best_format) override;
   virtual cricket::CaptureState Start(
-      const cricket::VideoFormat& capture_format) OVERRIDE;
-  virtual bool Pause(bool pause) OVERRIDE;
-  virtual void Stop() OVERRIDE;
-  virtual bool IsRunning() OVERRIDE;
-  virtual bool IsScreencast() const OVERRIDE;
-  virtual bool GetPreferredFourccs(std::vector<uint32>* fourccs) OVERRIDE;
+      const cricket::VideoFormat& capture_format) override;
+  virtual bool Pause(bool pause) override;
+  virtual void Stop() override;
+  virtual bool IsRunning() override;
+  virtual bool IsScreencast() const override;
+  virtual bool GetPreferredFourccs(std::vector<uint32>* fourccs) override;
 
  private:
   // Kicks off the next frame capture using |desktop_capturer_|.
diff --git a/remoting/host/chromeos/aura_desktop_capturer.h b/remoting/host/chromeos/aura_desktop_capturer.h
index a76abce..4ccd5db 100644
--- a/remoting/host/chromeos/aura_desktop_capturer.h
+++ b/remoting/host/chromeos/aura_desktop_capturer.h
@@ -28,8 +28,8 @@ class AuraDesktopCapturer : public webrtc::DesktopCapturer {
   virtual ~AuraDesktopCapturer();
 
   // webrtc::DesktopCapturer implementation.
-  virtual void Start(webrtc::DesktopCapturer::Callback* callback) OVERRIDE;
-  virtual void Capture(const webrtc::DesktopRegion& region) OVERRIDE;
+  virtual void Start(webrtc::DesktopCapturer::Callback* callback) override;
+  virtual void Capture(const webrtc::DesktopRegion& region) override;
 
  private:
   friend class AuraDesktopCapturerTest;
diff --git a/remoting/host/chromeos/aura_desktop_capturer_unittest.cc b/remoting/host/chromeos/aura_desktop_capturer_unittest.cc
index a665012..08139a9 100644
--- a/remoting/host/chromeos/aura_desktop_capturer_unittest.cc
+++ b/remoting/host/chromeos/aura_desktop_capturer_unittest.cc
@@ -39,7 +39,7 @@ class AuraDesktopCapturerTest : public testing::Test,
  public:
   AuraDesktopCapturerTest() {}
 
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
   MOCK_METHOD1(CreateSharedMemory, webrtc::SharedMemory*(size_t size));
   MOCK_METHOD1(OnCaptureCompleted, void(webrtc::DesktopFrame* frame));
diff --git a/remoting/host/chromium_port_allocator_factory.h b/remoting/host/chromium_port_allocator_factory.h
index 2558ab2..8d07e88 100644
--- a/remoting/host/chromium_port_allocator_factory.h
+++ b/remoting/host/chromium_port_allocator_factory.h
@@ -28,7 +28,7 @@ class ChromiumPortAllocatorFactory
   // webrtc::PortAllocatorFactoryInterface implementation.
   virtual cricket::PortAllocator* CreatePortAllocator(
       const std::vector<StunConfiguration>& stun_servers,
-      const std::vector<TurnConfiguration>& turn_configurations) OVERRIDE;
+      const std::vector<TurnConfiguration>& turn_configurations) override;
 
  protected:
   ChromiumPortAllocatorFactory(
diff --git a/remoting/host/chromoting_host.h b/remoting/host/chromoting_host.h
index 814a1a3..2a01c0e 100644
--- a/remoting/host/chromoting_host.h
+++ b/remoting/host/chromoting_host.h
@@ -90,8 +90,8 @@ class ChromotingHost : public base::NonThreadSafe,
   void Start(const std::string& host_owner);
 
   // HostStatusMonitor interface.
-  virtual void AddStatusObserver(HostStatusObserver* observer) OVERRIDE;
-  virtual void RemoveStatusObserver(HostStatusObserver* observer) OVERRIDE;
+  virtual void AddStatusObserver(HostStatusObserver* observer) override;
+  virtual void RemoveStatusObserver(HostStatusObserver* observer) override;
 
   // Registers a host extension.
   void AddExtension(scoped_ptr<HostExtension> extension);
@@ -120,21 +120,21 @@ class ChromotingHost : public base::NonThreadSafe,
 
   ////////////////////////////////////////////////////////////////////////////
   // ClientSession::EventHandler implementation.
-  virtual void OnSessionAuthenticating(ClientSession* client) OVERRIDE;
-  virtual bool OnSessionAuthenticated(ClientSession* client) OVERRIDE;
-  virtual void OnSessionChannelsConnected(ClientSession* client) OVERRIDE;
-  virtual void OnSessionAuthenticationFailed(ClientSession* client) OVERRIDE;
-  virtual void OnSessionClosed(ClientSession* session) OVERRIDE;
+  virtual void OnSessionAuthenticating(ClientSession* client) override;
+  virtual bool OnSessionAuthenticated(ClientSession* client) override;
+  virtual void OnSessionChannelsConnected(ClientSession* client) override;
+  virtual void OnSessionAuthenticationFailed(ClientSession* client) override;
+  virtual void OnSessionClosed(ClientSession* session) override;
   virtual void OnSessionRouteChange(
       ClientSession* session,
       const std::string& channel_name,
-      const protocol::TransportRoute& route) OVERRIDE;
+      const protocol::TransportRoute& route) override;
 
   // SessionManager::Listener implementation.
-  virtual void OnSessionManagerReady() OVERRIDE;
+  virtual void OnSessionManagerReady() override;
   virtual void OnIncomingSession(
       protocol::Session* session,
-      protocol::SessionManager::IncomingSessionResponse* response) OVERRIDE;
+      protocol::SessionManager::IncomingSessionResponse* response) override;
 
   // Gets the candidate configuration for the protocol.
   const protocol::CandidateSessionConfig* protocol_config() const {
diff --git a/remoting/host/chromoting_host_unittest.cc b/remoting/host/chromoting_host_unittest.cc
index c3c2fac..51bdd43 100644
--- a/remoting/host/chromoting_host_unittest.cc
+++ b/remoting/host/chromoting_host_unittest.cc
@@ -70,7 +70,7 @@ class ChromotingHostTest : public testing::Test {
   ChromotingHostTest() {
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     task_runner_ = new AutoThreadTaskRunner(
         message_loop_.message_loop_proxy(),
         base::Bind(&ChromotingHostTest::QuitMainMessageLoop,
@@ -225,7 +225,7 @@ class ChromotingHostTest : public testing::Test {
     host_->clients_.push_back(client.release());
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     // Make sure that the host has been properly deleted.
     DCHECK(host_.get() == NULL);
   }
diff --git a/remoting/host/client_session.h b/remoting/host/client_session.h
index 6b4d0f7..a974b59 100644
--- a/remoting/host/client_session.h
+++ b/remoting/host/client_session.h
@@ -106,41 +106,41 @@ class ClientSession
 
   // protocol::HostStub interface.
   virtual void NotifyClientResolution(
-      const protocol::ClientResolution& resolution) OVERRIDE;
+      const protocol::ClientResolution& resolution) override;
   virtual void ControlVideo(
-      const protocol::VideoControl& video_control) OVERRIDE;
+      const protocol::VideoControl& video_control) override;
   virtual void ControlAudio(
-      const protocol::AudioControl& audio_control) OVERRIDE;
+      const protocol::AudioControl& audio_control) override;
   virtual void SetCapabilities(
-      const protocol::Capabilities& capabilities) OVERRIDE;
+      const protocol::Capabilities& capabilities) override;
   virtual void RequestPairing(
-      const remoting::protocol::PairingRequest& pairing_request) OVERRIDE;
+      const remoting::protocol::PairingRequest& pairing_request) override;
   virtual void DeliverClientMessage(
-      const protocol::ExtensionMessage& message) OVERRIDE;
+      const protocol::ExtensionMessage& message) override;
 
   // protocol::ConnectionToClient::EventHandler interface.
   virtual void OnConnectionAuthenticating(
-      protocol::ConnectionToClient* connection) OVERRIDE;
+      protocol::ConnectionToClient* connection) override;
   virtual void OnConnectionAuthenticated(
-      protocol::ConnectionToClient* connection) OVERRIDE;
+      protocol::ConnectionToClient* connection) override;
   virtual void OnConnectionChannelsConnected(
-      protocol::ConnectionToClient* connection) OVERRIDE;
+      protocol::ConnectionToClient* connection) override;
   virtual void OnConnectionClosed(protocol::ConnectionToClient* connection,
-                                  protocol::ErrorCode error) OVERRIDE;
+                                  protocol::ErrorCode error) override;
   virtual void OnSequenceNumberUpdated(
-      protocol::ConnectionToClient* connection, int64 sequence_number) OVERRIDE;
+      protocol::ConnectionToClient* connection, int64 sequence_number) override;
   virtual void OnRouteChange(
       protocol::ConnectionToClient* connection,
       const std::string& channel_name,
-      const protocol::TransportRoute& route) OVERRIDE;
+      const protocol::TransportRoute& route) override;
 
   // ClientSessionControl interface.
-  virtual const std::string& client_jid() const OVERRIDE;
-  virtual void DisconnectSession() OVERRIDE;
+  virtual const std::string& client_jid() const override;
+  virtual void DisconnectSession() override;
   virtual void OnLocalMouseMoved(
-      const webrtc::DesktopVector& position) OVERRIDE;
-  virtual void SetDisableInputs(bool disable_inputs) OVERRIDE;
-  virtual void ResetVideoPipeline() OVERRIDE;
+      const webrtc::DesktopVector& position) override;
+  virtual void SetDisableInputs(bool disable_inputs) override;
+  virtual void ResetVideoPipeline() override;
 
   void SetGnubbyAuthHandlerForTesting(GnubbyAuthHandler* gnubby_auth_handler);
 
diff --git a/remoting/host/client_session_unittest.cc b/remoting/host/client_session_unittest.cc
index 05e5a65..289a106 100644
--- a/remoting/host/client_session_unittest.cc
+++ b/remoting/host/client_session_unittest.cc
@@ -122,8 +122,8 @@ class ClientSessionTest : public testing::Test {
  public:
   ClientSessionTest() : client_jid_("user@domain/rest-of-jid") {}
 
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
   // Creates the client session.
   void CreateClientSession();
diff --git a/remoting/host/clipboard_mac.mm b/remoting/host/clipboard_mac.mm
index 55d2f38..b4988a6 100644
--- a/remoting/host/clipboard_mac.mm
+++ b/remoting/host/clipboard_mac.mm
@@ -32,10 +32,10 @@ class ClipboardMac : public Clipboard {
 
   // Must be called on the UI thread.
   virtual void Start(
-      scoped_ptr<protocol::ClipboardStub> client_clipboard) OVERRIDE;
+      scoped_ptr<protocol::ClipboardStub> client_clipboard) override;
   virtual void InjectClipboardEvent(
-      const protocol::ClipboardEvent& event) OVERRIDE;
-  virtual void Stop() OVERRIDE;
+      const protocol::ClipboardEvent& event) override;
+  virtual void Stop() override;
 
  private:
   void CheckClipboardForChanges();
diff --git a/remoting/host/clipboard_win.cc b/remoting/host/clipboard_win.cc
index 4d8fd93..21ae6c7 100644
--- a/remoting/host/clipboard_win.cc
+++ b/remoting/host/clipboard_win.cc
@@ -103,10 +103,10 @@ class ClipboardWin : public Clipboard {
   ClipboardWin();
 
   virtual void Start(
-      scoped_ptr<protocol::ClipboardStub> client_clipboard) OVERRIDE;
+      scoped_ptr<protocol::ClipboardStub> client_clipboard) override;
   virtual void InjectClipboardEvent(
-      const protocol::ClipboardEvent& event) OVERRIDE;
-  virtual void Stop() OVERRIDE;
+      const protocol::ClipboardEvent& event) override;
+  virtual void Stop() override;
 
  private:
   void OnClipboardUpdate();
diff --git a/remoting/host/clipboard_x11.cc b/remoting/host/clipboard_x11.cc
index a5c91a6..dea6705 100644
--- a/remoting/host/clipboard_x11.cc
+++ b/remoting/host/clipboard_x11.cc
@@ -24,14 +24,14 @@ class ClipboardX11 : public Clipboard,
 
   // Clipboard interface.
   virtual void Start(
-      scoped_ptr<protocol::ClipboardStub> client_clipboard) OVERRIDE;
+      scoped_ptr<protocol::ClipboardStub> client_clipboard) override;
   virtual void InjectClipboardEvent(
-      const protocol::ClipboardEvent& event) OVERRIDE;
-  virtual void Stop() OVERRIDE;
+      const protocol::ClipboardEvent& event) override;
+  virtual void Stop() override;
 
   // MessageLoopForIO::Watcher interface.
-  virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE;
-  virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE;
+  virtual void OnFileCanReadWithoutBlocking(int fd) override;
+  virtual void OnFileCanWriteWithoutBlocking(int fd) override;
 
  private:
   void OnClipboardChanged(const std::string& mime_type,
diff --git a/remoting/host/config_file_watcher.h b/remoting/host/config_file_watcher.h
index 163f8b5..407ed40 100644
--- a/remoting/host/config_file_watcher.h
+++ b/remoting/host/config_file_watcher.h
@@ -33,7 +33,7 @@ class ConfigFileWatcher : public ConfigWatcher {
   virtual ~ConfigFileWatcher();
 
   // Inherited from ConfigWatcher.
-  virtual void Watch(Delegate* delegate) OVERRIDE;
+  virtual void Watch(Delegate* delegate) override;
 
  private:
   scoped_refptr<ConfigFileWatcherImpl> impl_;
diff --git a/remoting/host/config_file_watcher_unittest.cc b/remoting/host/config_file_watcher_unittest.cc
index 543f089..8a3b95f 100644
--- a/remoting/host/config_file_watcher_unittest.cc
+++ b/remoting/host/config_file_watcher_unittest.cc
@@ -42,8 +42,8 @@ class ConfigFileWatcherTest : public testing::Test {
   virtual ~ConfigFileWatcherTest();
 
   // testing::Test overrides
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
   // Stops the config file watcher.
   void StopWatcher();
diff --git a/remoting/host/continue_window.h b/remoting/host/continue_window.h
index 4a48e16..909bd92 100644
--- a/remoting/host/continue_window.h
+++ b/remoting/host/continue_window.h
@@ -19,7 +19,7 @@ class ContinueWindow : public HostWindow {
   // HostWindow override.
   virtual void Start(
       const base::WeakPtr<ClientSessionControl>& client_session_control)
-      OVERRIDE;
+      override;
 
   // Resumes paused client session.
   void ContinueSession();
diff --git a/remoting/host/continue_window_linux.cc b/remoting/host/continue_window_linux.cc
index 018c815..e3a8a60 100644
--- a/remoting/host/continue_window_linux.cc
+++ b/remoting/host/continue_window_linux.cc
@@ -21,8 +21,8 @@ class ContinueWindowGtk : public ContinueWindow {
 
  protected:
   // ContinueWindow overrides.
-  virtual void ShowUi() OVERRIDE;
-  virtual void HideUi() OVERRIDE;
+  virtual void ShowUi() override;
+  virtual void HideUi() override;
 
  private:
   void CreateWindow();
diff --git a/remoting/host/continue_window_mac.mm b/remoting/host/continue_window_mac.mm
index 7db1619..c6dd939 100644
--- a/remoting/host/continue_window_mac.mm
+++ b/remoting/host/continue_window_mac.mm
@@ -39,8 +39,8 @@ class ContinueWindowMac : public ContinueWindow {
 
  protected:
   // ContinueWindow overrides.
-  virtual void ShowUi() OVERRIDE;
-  virtual void HideUi() OVERRIDE;
+  virtual void ShowUi() override;
+  virtual void HideUi() override;
 
  private:
   base::scoped_nsobject<ContinueWindowMacController> controller_;
diff --git a/remoting/host/continue_window_win.cc b/remoting/host/continue_window_win.cc
index ebc306a..46814965 100644
--- a/remoting/host/continue_window_win.cc
+++ b/remoting/host/continue_window_win.cc
@@ -26,8 +26,8 @@ class ContinueWindowWin : public ContinueWindow {
 
  protected:
   // ContinueWindow overrides.
-  virtual void ShowUi() OVERRIDE;
-  virtual void HideUi() OVERRIDE;
+  virtual void ShowUi() override;
+  virtual void HideUi() override;
 
  private:
   static BOOL CALLBACK DialogProc(HWND hwmd, UINT msg, WPARAM wParam,
diff --git a/remoting/host/curtain_mode_linux.cc b/remoting/host/curtain_mode_linux.cc
index 66cf5fc..407ddf6 100644
--- a/remoting/host/curtain_mode_linux.cc
+++ b/remoting/host/curtain_mode_linux.cc
@@ -18,7 +18,7 @@ class CurtainModeLinux : public CurtainMode {
   CurtainModeLinux();
 
   // Overriden from CurtainMode.
-  virtual bool Activate() OVERRIDE;
+  virtual bool Activate() override;
 
  private:
   // Returns true if the host is running under an Xvfb session.
diff --git a/remoting/host/curtain_mode_mac.cc b/remoting/host/curtain_mode_mac.cc
index 04da373..57a5b33 100644
--- a/remoting/host/curtain_mode_mac.cc
+++ b/remoting/host/curtain_mode_mac.cc
@@ -229,7 +229,7 @@ class CurtainModeMac : public CurtainMode {
   virtual ~CurtainModeMac();
 
   // Overriden from CurtainMode.
-  virtual bool Activate() OVERRIDE;
+  virtual bool Activate() override;
 
  private:
   scoped_refptr<SessionWatcher> session_watcher_;
diff --git a/remoting/host/curtain_mode_win.cc b/remoting/host/curtain_mode_win.cc
index 3fc3946..a9f51c8 100644
--- a/remoting/host/curtain_mode_win.cc
+++ b/remoting/host/curtain_mode_win.cc
@@ -16,7 +16,7 @@ class CurtainModeWin : public CurtainMode {
   CurtainModeWin();
 
   // Overriden from CurtainMode.
-  virtual bool Activate() OVERRIDE;
+  virtual bool Activate() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CurtainModeWin);
diff --git a/remoting/host/daemon_process.h b/remoting/host/daemon_process.h
index b74090d..4b87312d 100644
--- a/remoting/host/daemon_process.h
+++ b/remoting/host/daemon_process.h
@@ -58,17 +58,17 @@ class DaemonProcess
       const base::Closure& stopped_callback);
 
   // ConfigWatcher::Delegate
-  virtual void OnConfigUpdated(const std::string& serialized_config) OVERRIDE;
-  virtual void OnConfigWatcherError() OVERRIDE;
+  virtual void OnConfigUpdated(const std::string& serialized_config) override;
+  virtual void OnConfigWatcherError() override;
 
   // HostStatusMonitor interface.
-  virtual void AddStatusObserver(HostStatusObserver* observer) OVERRIDE;
-  virtual void RemoveStatusObserver(HostStatusObserver* observer) OVERRIDE;
+  virtual void AddStatusObserver(HostStatusObserver* observer) override;
+  virtual void RemoveStatusObserver(HostStatusObserver* observer) override;
 
   // WorkerProcessIpcDelegate implementation.
-  virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
-  virtual void OnPermanentError(int exit_code) OVERRIDE;
+  virtual void OnChannelConnected(int32 peer_pid) override;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
+  virtual void OnPermanentError(int exit_code) override;
 
   // Sends an IPC message to the network process. The message will be dropped
   // unless the network process is connected over the IPC channel.
diff --git a/remoting/host/daemon_process_unittest.cc b/remoting/host/daemon_process_unittest.cc
index 7043f78..22877c6 100644
--- a/remoting/host/daemon_process_unittest.cc
+++ b/remoting/host/daemon_process_unittest.cc
@@ -43,7 +43,7 @@ class FakeDesktopSession : public DesktopSession {
   virtual ~FakeDesktopSession();
 
   virtual void SetScreenResolution(
-      const ScreenResolution& resolution) OVERRIDE {}
+      const ScreenResolution& resolution) override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FakeDesktopSession);
@@ -60,10 +60,10 @@ class MockDaemonProcess : public DaemonProcess {
   virtual scoped_ptr<DesktopSession> DoCreateDesktopSession(
       int terminal_id,
       const ScreenResolution& resolution,
-      bool virtual_terminal) OVERRIDE;
+      bool virtual_terminal) override;
 
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
-  virtual void SendToNetwork(IPC::Message* message) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
+  virtual void SendToNetwork(IPC::Message* message) override;
 
   MOCK_METHOD1(Received, void(const IPC::Message&));
   MOCK_METHOD1(Sent, void(const IPC::Message&));
@@ -124,8 +124,8 @@ class DaemonProcessTest : public testing::Test {
   DaemonProcessTest();
   virtual ~DaemonProcessTest();
 
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
   // DaemonProcess mocks
   DesktopSession* DoCreateDesktopSession(int terminal_id);
diff --git a/remoting/host/daemon_process_win.cc b/remoting/host/daemon_process_win.cc
index e848d9e..c499fba 100644
--- a/remoting/host/daemon_process_win.cc
+++ b/remoting/host/daemon_process_win.cc
@@ -70,25 +70,25 @@ class DaemonProcessWin : public DaemonProcess {
   virtual ~DaemonProcessWin();
 
   // WorkerProcessIpcDelegate implementation.
-  virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
-  virtual void OnPermanentError(int exit_code) OVERRIDE;
+  virtual void OnChannelConnected(int32 peer_pid) override;
+  virtual void OnPermanentError(int exit_code) override;
 
   // DaemonProcess overrides.
-  virtual void SendToNetwork(IPC::Message* message) OVERRIDE;
+  virtual void SendToNetwork(IPC::Message* message) override;
   virtual bool OnDesktopSessionAgentAttached(
       int terminal_id,
       base::ProcessHandle desktop_process,
-      IPC::PlatformFileForTransit desktop_pipe) OVERRIDE;
+      IPC::PlatformFileForTransit desktop_pipe) override;
 
  protected:
   // DaemonProcess implementation.
   virtual scoped_ptr<DesktopSession> DoCreateDesktopSession(
       int terminal_id,
       const ScreenResolution& resolution,
-      bool virtual_terminal) OVERRIDE;
+      bool virtual_terminal) override;
   virtual void DoCrashNetworkProcess(
-      const tracked_objects::Location& location) OVERRIDE;
-  virtual void LaunchNetworkProcess() OVERRIDE;
+      const tracked_objects::Location& location) override;
+  virtual void LaunchNetworkProcess() override;
 
   // Changes the service start type to 'manual'.
   void DisableAutoStart();
diff --git a/remoting/host/desktop_process.h b/remoting/host/desktop_process.h
index bddbaaa..b09fb1b 100644
--- a/remoting/host/desktop_process.h
+++ b/remoting/host/desktop_process.h
@@ -38,13 +38,13 @@ class DesktopProcess : public DesktopSessionAgent::Delegate,
   virtual ~DesktopProcess();
 
   // DesktopSessionAgent::Delegate implementation.
-  virtual DesktopEnvironmentFactory& desktop_environment_factory() OVERRIDE;
-  virtual void OnNetworkProcessDisconnected() OVERRIDE;
+  virtual DesktopEnvironmentFactory& desktop_environment_factory() override;
+  virtual void OnNetworkProcessDisconnected() override;
 
   // IPC::Listener implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
-  virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
-  virtual void OnChannelError() OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
+  virtual void OnChannelConnected(int32 peer_pid) override;
+  virtual void OnChannelError() override;
 
   // Injects Secure Attention Sequence.
   void InjectSas();
diff --git a/remoting/host/desktop_process_unittest.cc b/remoting/host/desktop_process_unittest.cc
index 69acc3a..39dc75b 100644
--- a/remoting/host/desktop_process_unittest.cc
+++ b/remoting/host/desktop_process_unittest.cc
@@ -43,7 +43,7 @@ class MockDaemonListener : public IPC::Listener {
   MockDaemonListener() {}
   virtual ~MockDaemonListener() {}
 
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
   MOCK_METHOD1(OnDesktopAttached, void(IPC::PlatformFileForTransit));
   MOCK_METHOD1(OnChannelConnected, void(int32));
@@ -58,7 +58,7 @@ class MockNetworkListener : public IPC::Listener {
   MockNetworkListener() {}
   virtual ~MockNetworkListener() {}
 
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
   MOCK_METHOD1(OnChannelConnected, void(int32));
   MOCK_METHOD0(OnChannelError, void());
@@ -98,8 +98,8 @@ class DesktopProcessTest : public testing::Test {
   virtual ~DesktopProcessTest();
 
   // testing::Test overrides
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
   // MockDaemonListener mocks
   void ConnectNetworkChannel(IPC::PlatformFileForTransit desktop_process);
diff --git a/remoting/host/desktop_resizer_linux.cc b/remoting/host/desktop_resizer_linux.cc
index df38cd4..f28c1c6 100644
--- a/remoting/host/desktop_resizer_linux.cc
+++ b/remoting/host/desktop_resizer_linux.cc
@@ -127,11 +127,11 @@ class DesktopResizerLinux : public DesktopResizer {
   virtual ~DesktopResizerLinux();
 
   // DesktopResizer interface
-  virtual ScreenResolution GetCurrentResolution() OVERRIDE;
+  virtual ScreenResolution GetCurrentResolution() override;
   virtual std::list<ScreenResolution> GetSupportedResolutions(
-      const ScreenResolution& preferred) OVERRIDE;
-  virtual void SetResolution(const ScreenResolution& resolution) OVERRIDE;
-  virtual void RestoreResolution(const ScreenResolution& original) OVERRIDE;
+      const ScreenResolution& preferred) override;
+  virtual void SetResolution(const ScreenResolution& resolution) override;
+  virtual void RestoreResolution(const ScreenResolution& original) override;
 
  private:
   // Create a mode, and attach it to the primary output. If the mode already
diff --git a/remoting/host/desktop_resizer_mac.cc b/remoting/host/desktop_resizer_mac.cc
index 42adbc4..a4ac574 100644
--- a/remoting/host/desktop_resizer_mac.cc
+++ b/remoting/host/desktop_resizer_mac.cc
@@ -24,11 +24,11 @@ class DesktopResizerMac : public DesktopResizer {
   DesktopResizerMac();
 
   // DesktopResizer interface
-  virtual ScreenResolution GetCurrentResolution() OVERRIDE;
+  virtual ScreenResolution GetCurrentResolution() override;
   virtual std::list<ScreenResolution> GetSupportedResolutions(
-      const ScreenResolution& preferred) OVERRIDE;
-  virtual void SetResolution(const ScreenResolution& resolution) OVERRIDE;
-  virtual void RestoreResolution(const ScreenResolution& original) OVERRIDE;
+      const ScreenResolution& preferred) override;
+  virtual void SetResolution(const ScreenResolution& resolution) override;
+  virtual void RestoreResolution(const ScreenResolution& original) override;
 
  private:
   // If there is a single display, get its id and return true, otherwise return
diff --git a/remoting/host/desktop_resizer_win.cc b/remoting/host/desktop_resizer_win.cc
index 8abd0de..f22f023 100644
--- a/remoting/host/desktop_resizer_win.cc
+++ b/remoting/host/desktop_resizer_win.cc
@@ -35,11 +35,11 @@ class DesktopResizerWin : public DesktopResizer {
   virtual ~DesktopResizerWin();
 
   // DesktopResizer interface.
-  virtual ScreenResolution GetCurrentResolution() OVERRIDE;
+  virtual ScreenResolution GetCurrentResolution() override;
   virtual std::list<ScreenResolution> GetSupportedResolutions(
-      const ScreenResolution& preferred) OVERRIDE;
-  virtual void SetResolution(const ScreenResolution& resolution) OVERRIDE;
-  virtual void RestoreResolution(const ScreenResolution& original) OVERRIDE;
+      const ScreenResolution& preferred) override;
+  virtual void SetResolution(const ScreenResolution& resolution) override;
+  virtual void RestoreResolution(const ScreenResolution& original) override;
 
  private:
   static bool IsResizeSupported();
diff --git a/remoting/host/desktop_session_agent.cc b/remoting/host/desktop_session_agent.cc
index 2be6266..d4b15a0 100644
--- a/remoting/host/desktop_session_agent.cc
+++ b/remoting/host/desktop_session_agent.cc
@@ -43,7 +43,7 @@ class DesktopSesssionClipboardStub : public protocol::ClipboardStub {
 
   // protocol::ClipboardStub implementation.
   virtual void InjectClipboardEvent(
-      const protocol::ClipboardEvent& event) OVERRIDE;
+      const protocol::ClipboardEvent& event) override;
 
  private:
   scoped_refptr<DesktopSessionAgent> desktop_session_agent_;
diff --git a/remoting/host/desktop_session_agent.h b/remoting/host/desktop_session_agent.h
index 90a23cb..0aec84d 100644
--- a/remoting/host/desktop_session_agent.h
+++ b/remoting/host/desktop_session_agent.h
@@ -71,19 +71,19 @@ class DesktopSessionAgent
       scoped_refptr<AutoThreadTaskRunner> video_capture_task_runner);
 
   // IPC::Listener implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
-  virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
-  virtual void OnChannelError() OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
+  virtual void OnChannelConnected(int32 peer_pid) override;
+  virtual void OnChannelError() override;
 
   // webrtc::DesktopCapturer::Callback implementation.
-  virtual webrtc::SharedMemory* CreateSharedMemory(size_t size) OVERRIDE;
-  virtual void OnCaptureCompleted(webrtc::DesktopFrame* frame) OVERRIDE;
+  virtual webrtc::SharedMemory* CreateSharedMemory(size_t size) override;
+  virtual void OnCaptureCompleted(webrtc::DesktopFrame* frame) override;
 
   // webrtc::MouseCursorMonitor::Callback implementation.
-  virtual void OnMouseCursor(webrtc::MouseCursor* cursor) OVERRIDE;
+  virtual void OnMouseCursor(webrtc::MouseCursor* cursor) override;
   virtual void OnMouseCursorPosition(
       webrtc::MouseCursorMonitor::CursorState state,
-      const webrtc::DesktopVector& position) OVERRIDE;
+      const webrtc::DesktopVector& position) override;
 
   // Forwards a local clipboard event though the IPC channel to the network
   // process.
@@ -107,12 +107,12 @@ class DesktopSessionAgent
   virtual ~DesktopSessionAgent();
 
   // ClientSessionControl interface.
-  virtual const std::string& client_jid() const OVERRIDE;
-  virtual void DisconnectSession() OVERRIDE;
+  virtual const std::string& client_jid() const override;
+  virtual void DisconnectSession() override;
   virtual void OnLocalMouseMoved(
-    const webrtc::DesktopVector& position) OVERRIDE;
-  virtual void SetDisableInputs(bool disable_inputs) OVERRIDE;
-  virtual void ResetVideoPipeline() OVERRIDE;
+    const webrtc::DesktopVector& position) override;
+  virtual void SetDisableInputs(bool disable_inputs) override;
+  virtual void ResetVideoPipeline() override;
 
   // Handles StartSessionAgent request from the client.
   void OnStartSessionAgent(const std::string& authenticated_jid,
diff --git a/remoting/host/desktop_session_proxy.h b/remoting/host/desktop_session_proxy.h
index 941b4e5..e40915e 100644
--- a/remoting/host/desktop_session_proxy.h
+++ b/remoting/host/desktop_session_proxy.h
@@ -87,9 +87,9 @@ class DesktopSessionProxy
   void SetCapabilities(const std::string& capabilities);
 
   // IPC::Listener implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
-  virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
-  virtual void OnChannelError() OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
+  virtual void OnChannelConnected(int32 peer_pid) override;
+  virtual void OnChannelError() override;
 
   // Connects to the desktop session agent.
   bool AttachToDesktop(base::ProcessHandle desktop_process,
diff --git a/remoting/host/desktop_session_win.cc b/remoting/host/desktop_session_win.cc
index b147783..445febd 100644
--- a/remoting/host/desktop_session_win.cc
+++ b/remoting/host/desktop_session_win.cc
@@ -96,10 +96,10 @@ class ConsoleSession : public DesktopSessionWin {
 
  protected:
   // DesktopSession overrides.
-  virtual void SetScreenResolution(const ScreenResolution& resolution) OVERRIDE;
+  virtual void SetScreenResolution(const ScreenResolution& resolution) override;
 
   // DesktopSessionWin overrides.
-  virtual void InjectSas() OVERRIDE;
+  virtual void InjectSas() override;
 
  private:
   scoped_ptr<SasInjector> sas_injector_;
@@ -131,10 +131,10 @@ class RdpSession : public DesktopSessionWin {
 
  protected:
   // DesktopSession overrides.
-  virtual void SetScreenResolution(const ScreenResolution& resolution) OVERRIDE;
+  virtual void SetScreenResolution(const ScreenResolution& resolution) override;
 
   // DesktopSessionWin overrides.
-  virtual void InjectSas() OVERRIDE;
+  virtual void InjectSas() override;
 
  private:
   // An implementation of IRdpDesktopSessionEventHandler interface that forwards
@@ -145,13 +145,13 @@ class RdpSession : public DesktopSessionWin {
     virtual ~EventHandler();
 
     // IUnknown interface.
-    STDMETHOD_(ULONG, AddRef)() OVERRIDE;
-    STDMETHOD_(ULONG, Release)() OVERRIDE;
-    STDMETHOD(QueryInterface)(REFIID riid, void** ppv) OVERRIDE;
+    STDMETHOD_(ULONG, AddRef)() override;
+    STDMETHOD_(ULONG, Release)() override;
+    STDMETHOD(QueryInterface)(REFIID riid, void** ppv) override;
 
     // IRdpDesktopSessionEventHandler interface.
-    STDMETHOD(OnRdpConnected)() OVERRIDE;
-    STDMETHOD(OnRdpClosed)() OVERRIDE;
+    STDMETHOD(OnRdpConnected)() override;
+    STDMETHOD(OnRdpClosed)() override;
 
    private:
     ULONG ref_count_;
diff --git a/remoting/host/desktop_session_win.h b/remoting/host/desktop_session_win.h
index d5d02387..3e21a02 100644
--- a/remoting/host/desktop_session_win.h
+++ b/remoting/host/desktop_session_win.h
@@ -85,13 +85,13 @@ class DesktopSessionWin
   virtual void InjectSas() = 0;
 
   // WorkerProcessIpcDelegate implementation.
-  virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
-  virtual void OnPermanentError(int exit_code) OVERRIDE;
+  virtual void OnChannelConnected(int32 peer_pid) override;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
+  virtual void OnPermanentError(int exit_code) override;
 
   // WtsTerminalObserver implementation.
-  virtual void OnSessionAttached(uint32 session_id) OVERRIDE;
-  virtual void OnSessionDetached() OVERRIDE;
+  virtual void OnSessionAttached(uint32 session_id) override;
+  virtual void OnSessionDetached() override;
 
  private:
   // ChromotingDesktopDaemonMsg_DesktopAttached handler.
diff --git a/remoting/host/disconnect_window_linux.cc b/remoting/host/disconnect_window_linux.cc
index c51b578..daae57a 100644
--- a/remoting/host/disconnect_window_linux.cc
+++ b/remoting/host/disconnect_window_linux.cc
@@ -27,7 +27,7 @@ class DisconnectWindowGtk : public HostWindow {
   // HostWindow overrides.
   virtual void Start(
       const base::WeakPtr<ClientSessionControl>& client_session_control)
-      OVERRIDE;
+      override;
 
  private:
   CHROMEG_CALLBACK_1(DisconnectWindowGtk, gboolean, OnDelete,
diff --git a/remoting/host/disconnect_window_mac.mm b/remoting/host/disconnect_window_mac.mm
index 5acfb2b..e999b91 100644
--- a/remoting/host/disconnect_window_mac.mm
+++ b/remoting/host/disconnect_window_mac.mm
@@ -34,7 +34,7 @@ class DisconnectWindowMac : public HostWindow {
   // HostWindow overrides.
   virtual void Start(
       const base::WeakPtr<ClientSessionControl>& client_session_control)
-      OVERRIDE;
+      override;
 
  private:
   DisconnectWindowController* window_controller_;
diff --git a/remoting/host/disconnect_window_win.cc b/remoting/host/disconnect_window_win.cc
index a9b892c..b9736ef 100644
--- a/remoting/host/disconnect_window_win.cc
+++ b/remoting/host/disconnect_window_win.cc
@@ -40,7 +40,7 @@ class DisconnectWindowWin : public HostWindow {
   // HostWindow overrides.
   virtual void Start(
       const base::WeakPtr<ClientSessionControl>& client_session_control)
-      OVERRIDE;
+      override;
 
  protected:
   static INT_PTR CALLBACK DialogProc(HWND hwnd, UINT message, WPARAM wparam,
diff --git a/remoting/host/dns_blackhole_checker.h b/remoting/host/dns_blackhole_checker.h
index dc2fea6..38bc055 100644
--- a/remoting/host/dns_blackhole_checker.h
+++ b/remoting/host/dns_blackhole_checker.h
@@ -28,7 +28,7 @@ class DnsBlackholeChecker : public net::URLFetcherDelegate {
   virtual ~DnsBlackholeChecker();
 
   // net::URLFetcherDelegate interface.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   // Initiates a check the verify that the host talkgadget has not been "DNS
   // blackholed" to prevent connections. If this is called again before the
diff --git a/remoting/host/fake_desktop_capturer.h b/remoting/host/fake_desktop_capturer.h
index b7dbc74..c8468c8 100644
--- a/remoting/host/fake_desktop_capturer.h
+++ b/remoting/host/fake_desktop_capturer.h
@@ -34,8 +34,8 @@ class FakeDesktopCapturer : public webrtc::DesktopCapturer {
   void set_frame_generator(const FrameGenerator& frame_generator);
 
   // webrtc::DesktopCapturer interface.
-  virtual void Start(Callback* callback) OVERRIDE;
-  virtual void Capture(const webrtc::DesktopRegion& rect) OVERRIDE;
+  virtual void Start(Callback* callback) override;
+  virtual void Capture(const webrtc::DesktopRegion& rect) override;
 
  private:
   FrameGenerator frame_generator_;
diff --git a/remoting/host/fake_desktop_environment.h b/remoting/host/fake_desktop_environment.h
index 91fd9bb..64d293a 100644
--- a/remoting/host/fake_desktop_environment.h
+++ b/remoting/host/fake_desktop_environment.h
@@ -19,12 +19,12 @@ class FakeInputInjector : public InputInjector {
   virtual ~FakeInputInjector();
 
   virtual void Start(
-      scoped_ptr<protocol::ClipboardStub> client_clipboard) OVERRIDE;
-  virtual void InjectKeyEvent(const protocol::KeyEvent& event) OVERRIDE;
-  virtual void InjectTextEvent(const protocol::TextEvent& event) OVERRIDE;
-  virtual void InjectMouseEvent(const protocol::MouseEvent& event) OVERRIDE;
+      scoped_ptr<protocol::ClipboardStub> client_clipboard) override;
+  virtual void InjectKeyEvent(const protocol::KeyEvent& event) override;
+  virtual void InjectTextEvent(const protocol::TextEvent& event) override;
+  virtual void InjectMouseEvent(const protocol::MouseEvent& event) override;
   virtual void InjectClipboardEvent(
-      const protocol::ClipboardEvent& event) OVERRIDE;
+      const protocol::ClipboardEvent& event) override;
 };
 
 class FakeScreenControls : public ScreenControls {
@@ -33,7 +33,7 @@ class FakeScreenControls : public ScreenControls {
   virtual ~FakeScreenControls();
 
   // ScreenControls implementation.
-  virtual void SetScreenResolution(const ScreenResolution& resolution) OVERRIDE;
+  virtual void SetScreenResolution(const ScreenResolution& resolution) override;
 };
 
 class FakeDesktopEnvironment : public DesktopEnvironment {
@@ -49,16 +49,16 @@ class FakeDesktopEnvironment : public DesktopEnvironment {
   }
 
   // DesktopEnvironment implementation.
-  virtual scoped_ptr<AudioCapturer> CreateAudioCapturer() OVERRIDE;
-  virtual scoped_ptr<InputInjector> CreateInputInjector() OVERRIDE;
-  virtual scoped_ptr<ScreenControls> CreateScreenControls() OVERRIDE;
-  virtual scoped_ptr<webrtc::DesktopCapturer> CreateVideoCapturer() OVERRIDE;
+  virtual scoped_ptr<AudioCapturer> CreateAudioCapturer() override;
+  virtual scoped_ptr<InputInjector> CreateInputInjector() override;
+  virtual scoped_ptr<ScreenControls> CreateScreenControls() override;
+  virtual scoped_ptr<webrtc::DesktopCapturer> CreateVideoCapturer() override;
   virtual scoped_ptr<webrtc::MouseCursorMonitor> CreateMouseCursorMonitor()
-      OVERRIDE;
-  virtual std::string GetCapabilities() const OVERRIDE;
-  virtual void SetCapabilities(const std::string& capabilities) OVERRIDE;
+      override;
+  virtual std::string GetCapabilities() const override;
+  virtual void SetCapabilities(const std::string& capabilities) override;
   virtual scoped_ptr<GnubbyAuthHandler> CreateGnubbyAuthHandler(
-      protocol::ClientStub* client_stub) OVERRIDE;
+      protocol::ClientStub* client_stub) override;
 
  private:
   FakeDesktopCapturer::FrameGenerator frame_generator_;
@@ -80,10 +80,10 @@ class FakeDesktopEnvironmentFactory : public DesktopEnvironmentFactory {
 
   // DesktopEnvironmentFactory implementation.
   virtual scoped_ptr<DesktopEnvironment> Create(
-      base::WeakPtr<ClientSessionControl> client_session_control) OVERRIDE;
-  virtual void SetEnableCurtaining(bool enable) OVERRIDE;
-  virtual bool SupportsAudioCapture() const OVERRIDE;
-  virtual void SetEnableGnubbyAuth(bool enable) OVERRIDE;
+      base::WeakPtr<ClientSessionControl> client_session_control) override;
+  virtual void SetEnableCurtaining(bool enable) override;
+  virtual bool SupportsAudioCapture() const override;
+  virtual void SetEnableGnubbyAuth(bool enable) override;
 
  private:
   FakeDesktopCapturer::FrameGenerator frame_generator_;
diff --git a/remoting/host/fake_host_extension.cc b/remoting/host/fake_host_extension.cc
index c16cd03..2a8160a 100644
--- a/remoting/host/fake_host_extension.cc
+++ b/remoting/host/fake_host_extension.cc
@@ -21,13 +21,13 @@ class FakeExtension::Session : public HostExtensionSession {
 
   // HostExtensionSession interface.
   virtual void OnCreateVideoCapturer(
-      scoped_ptr<webrtc::DesktopCapturer>* encoder) OVERRIDE;
-  virtual void OnCreateVideoEncoder(scoped_ptr<VideoEncoder>* encoder) OVERRIDE;
-  virtual bool ModifiesVideoPipeline() const OVERRIDE;
+      scoped_ptr<webrtc::DesktopCapturer>* encoder) override;
+  virtual void OnCreateVideoEncoder(scoped_ptr<VideoEncoder>* encoder) override;
+  virtual bool ModifiesVideoPipeline() const override;
   virtual bool OnExtensionMessage(
       ClientSessionControl* client_session_control,
       protocol::ClientStub* client_stub,
-      const protocol::ExtensionMessage& message) OVERRIDE;
+      const protocol::ExtensionMessage& message) override;
 
  private:
   FakeExtension* extension_;
diff --git a/remoting/host/fake_host_extension.h b/remoting/host/fake_host_extension.h
index c52376c..3b97b74 100644
--- a/remoting/host/fake_host_extension.h
+++ b/remoting/host/fake_host_extension.h
@@ -27,10 +27,10 @@ class FakeExtension : public HostExtension {
   virtual ~FakeExtension();
 
   // HostExtension interface.
-  virtual std::string capability() const OVERRIDE;
+  virtual std::string capability() const override;
   virtual scoped_ptr<HostExtensionSession> CreateExtensionSession(
       ClientSessionControl* client_session_control,
-      protocol::ClientStub* client_stub) OVERRIDE;
+      protocol::ClientStub* client_stub) override;
 
   // Controls for testing.
   void set_steal_video_capturer(bool steal_video_capturer) {
diff --git a/remoting/host/fake_host_status_monitor.h b/remoting/host/fake_host_status_monitor.h
index aa37c5e..dd85795 100644
--- a/remoting/host/fake_host_status_monitor.h
+++ b/remoting/host/fake_host_status_monitor.h
@@ -18,8 +18,8 @@ class FakeHostStatusMonitor
   virtual ~FakeHostStatusMonitor() {}
 
   // HostStatusMonitor interface.
-  virtual void AddStatusObserver(HostStatusObserver* observer) OVERRIDE {}
-  virtual void RemoveStatusObserver(HostStatusObserver* observer) OVERRIDE {}
+  virtual void AddStatusObserver(HostStatusObserver* observer) override {}
+  virtual void RemoveStatusObserver(HostStatusObserver* observer) override {}
 };
 
 }  // namespace remoting
diff --git a/remoting/host/fake_mouse_cursor_monitor.h b/remoting/host/fake_mouse_cursor_monitor.h
index 0b46d72..ebb20c5 100644
--- a/remoting/host/fake_mouse_cursor_monitor.h
+++ b/remoting/host/fake_mouse_cursor_monitor.h
@@ -14,8 +14,8 @@ class FakeMouseCursorMonitor : public webrtc::MouseCursorMonitor {
   FakeMouseCursorMonitor();
   virtual ~FakeMouseCursorMonitor();
 
-  virtual void Init(Callback* callback, Mode mode) OVERRIDE;
-  virtual void Capture() OVERRIDE;
+  virtual void Init(Callback* callback, Mode mode) override;
+  virtual void Capture() override;
 
  private:
   Callback* callback_;
diff --git a/remoting/host/gnubby_auth_handler_posix.h b/remoting/host/gnubby_auth_handler_posix.h
index db38886..99e9256 100644
--- a/remoting/host/gnubby_auth_handler_posix.h
+++ b/remoting/host/gnubby_auth_handler_posix.h
@@ -41,17 +41,17 @@ class GnubbyAuthHandlerPosix : public GnubbyAuthHandler,
   typedef std::map<int, GnubbySocket*> ActiveSockets;
 
   // GnubbyAuthHandler interface.
-  virtual void DeliverClientMessage(const std::string& message) OVERRIDE;
+  virtual void DeliverClientMessage(const std::string& message) override;
   virtual void DeliverHostDataMessage(int connection_id,
-                                      const std::string& data) const OVERRIDE;
+                                      const std::string& data) const override;
 
   // StreamListenSocket::Delegate interface.
   virtual void DidAccept(net::StreamListenSocket* server,
-                         scoped_ptr<net::StreamListenSocket> socket) OVERRIDE;
+                         scoped_ptr<net::StreamListenSocket> socket) override;
   virtual void DidRead(net::StreamListenSocket* socket,
                        const char* data,
-                       int len) OVERRIDE;
-  virtual void DidClose(net::StreamListenSocket* socket) OVERRIDE;
+                       int len) override;
+  virtual void DidClose(net::StreamListenSocket* socket) override;
 
   // Create socket for authorization.
   void CreateAuthorizationSocket();
diff --git a/remoting/host/gnubby_auth_handler_posix_unittest.cc b/remoting/host/gnubby_auth_handler_posix_unittest.cc
index 94f28e0..139a560 100644
--- a/remoting/host/gnubby_auth_handler_posix_unittest.cc
+++ b/remoting/host/gnubby_auth_handler_posix_unittest.cc
@@ -42,7 +42,7 @@ class MockStreamListenSocket : public net::StreamListenSocket {
   explicit MockStreamListenSocket(net::StreamListenSocket::Delegate* delegate)
       : StreamListenSocket(net::kInvalidSocket, delegate) {}
 
-  virtual void Accept() OVERRIDE { NOTREACHED(); }
+  virtual void Accept() override { NOTREACHED(); }
 
  private:
   virtual ~MockStreamListenSocket() {}
@@ -54,7 +54,7 @@ class GnubbyAuthHandlerPosixTest : public testing::Test {
  public:
   GnubbyAuthHandlerPosixTest() {}
 
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
  protected:
   // Object under test.
diff --git a/remoting/host/gnubby_auth_handler_win.cc b/remoting/host/gnubby_auth_handler_win.cc
index c512466..e24eb6b 100644
--- a/remoting/host/gnubby_auth_handler_win.cc
+++ b/remoting/host/gnubby_auth_handler_win.cc
@@ -13,9 +13,9 @@ namespace {
 class GnubbyAuthHandlerWin : public GnubbyAuthHandler {
  private:
   // GnubbyAuthHandler interface.
-  virtual void DeliverClientMessage(const std::string& message) OVERRIDE;
+  virtual void DeliverClientMessage(const std::string& message) override;
   virtual void DeliverHostDataMessage(int connection_id,
-                                      const std::string& data) const OVERRIDE;
+                                      const std::string& data) const override;
 
   DISALLOW_COPY_AND_ASSIGN(GnubbyAuthHandlerWin);
 };
diff --git a/remoting/host/heartbeat_sender.h b/remoting/host/heartbeat_sender.h
index e472e5b..a3f3057 100644
--- a/remoting/host/heartbeat_sender.h
+++ b/remoting/host/heartbeat_sender.h
@@ -102,9 +102,9 @@ class HeartbeatSender : public SignalStrategy::Listener {
 
   // 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_TEST_ALL_PREFIXES(HeartbeatSenderTest, DoSendStanza);
diff --git a/remoting/host/heartbeat_sender_unittest.cc b/remoting/host/heartbeat_sender_unittest.cc
index 636501e..fb8acee 100644
--- a/remoting/host/heartbeat_sender_unittest.cc
+++ b/remoting/host/heartbeat_sender_unittest.cc
@@ -44,7 +44,7 @@ const char kStanzaId[] = "123";
 class MockListener : public HeartbeatSender::Listener {
  public:
   // Overridden from HeartbeatSender::Listener
-  virtual void OnUnknownHostIdError() OVERRIDE {
+  virtual void OnUnknownHostIdError() override {
     NOTREACHED();
   }
 
@@ -65,7 +65,7 @@ ACTION_P(RemoveListener, list) {
 class HeartbeatSenderTest
     : public testing::Test {
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     key_pair_ = RsaKeyPair::FromString(kTestRsaKeyPair);
     ASSERT_TRUE(key_pair_.get());
 
@@ -82,7 +82,7 @@ class HeartbeatSenderTest
         &mock_listener_, kHostId, &signal_strategy_, key_pair_, kTestBotJid));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     heartbeat_sender_.reset();
     EXPECT_TRUE(signal_strategy_listeners_.empty());
   }
diff --git a/remoting/host/host_change_notification_listener.h b/remoting/host/host_change_notification_listener.h
index 52e91b5..e7ff2fe 100644
--- a/remoting/host/host_change_notification_listener.h
+++ b/remoting/host/host_change_notification_listener.h
@@ -41,9 +41,9 @@ class HostChangeNotificationListener : public SignalStrategy::Listener {
 
   // 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:
   void OnHostDeleted();
diff --git a/remoting/host/host_change_notification_listener_unittest.cc b/remoting/host/host_change_notification_listener_unittest.cc
index f50db65..c04c836 100644
--- a/remoting/host/host_change_notification_listener_unittest.cc
+++ b/remoting/host/host_change_notification_listener_unittest.cc
@@ -48,7 +48,7 @@ class HostChangeNotificationListenerTest : public testing::Test {
     MOCK_METHOD0(OnHostDeleted, void());
   };
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     EXPECT_CALL(signal_strategy_, AddListener(NotNull()))
         .WillRepeatedly(AddListener(&signal_strategy_listeners_));
     EXPECT_CALL(signal_strategy_, RemoveListener(NotNull()))
@@ -60,7 +60,7 @@ class HostChangeNotificationListenerTest : public testing::Test {
         &mock_listener_, kHostId, &signal_strategy_, kTestBotJid));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     host_change_notification_listener_.reset();
     EXPECT_TRUE(signal_strategy_listeners_.empty());
   }
diff --git a/remoting/host/host_event_logger_posix.cc b/remoting/host/host_event_logger_posix.cc
index c462b64..eb25429 100644
--- a/remoting/host/host_event_logger_posix.cc
+++ b/remoting/host/host_event_logger_posix.cc
@@ -30,15 +30,15 @@ class HostEventLoggerPosix : public HostEventLogger, public HostStatusObserver {
 
   // HostStatusObserver implementation.  These methods will be called from the
   // network thread.
-  virtual void OnClientAuthenticated(const std::string& jid) OVERRIDE;
-  virtual void OnClientDisconnected(const std::string& jid) OVERRIDE;
-  virtual void OnAccessDenied(const std::string& jid) OVERRIDE;
+  virtual void OnClientAuthenticated(const std::string& jid) override;
+  virtual void OnClientDisconnected(const std::string& jid) override;
+  virtual void OnAccessDenied(const std::string& jid) override;
   virtual void OnClientRouteChange(
       const std::string& jid,
       const std::string& channel_name,
-      const protocol::TransportRoute& route) OVERRIDE;
-  virtual void OnStart(const std::string& xmpp_login) OVERRIDE;
-  virtual void OnShutdown() OVERRIDE;
+      const protocol::TransportRoute& route) override;
+  virtual void OnStart(const std::string& xmpp_login) override;
+  virtual void OnShutdown() override;
 
  private:
   void Log(const std::string& message);
diff --git a/remoting/host/host_event_logger_win.cc b/remoting/host/host_event_logger_win.cc
index f89c97d..374cddb 100644
--- a/remoting/host/host_event_logger_win.cc
+++ b/remoting/host/host_event_logger_win.cc
@@ -32,15 +32,15 @@ class HostEventLoggerWin : public HostEventLogger, public HostStatusObserver {
 
   // HostStatusObserver implementation.  These methods will be called from the
   // network thread.
-  virtual void OnClientAuthenticated(const std::string& jid) OVERRIDE;
-  virtual void OnClientDisconnected(const std::string& jid) OVERRIDE;
-  virtual void OnAccessDenied(const std::string& jid) OVERRIDE;
+  virtual void OnClientAuthenticated(const std::string& jid) override;
+  virtual void OnClientDisconnected(const std::string& jid) override;
+  virtual void OnAccessDenied(const std::string& jid) override;
   virtual void OnClientRouteChange(
       const std::string& jid,
       const std::string& channel_name,
-      const protocol::TransportRoute& route) OVERRIDE;
-  virtual void OnStart(const std::string& xmpp_login) OVERRIDE;
-  virtual void OnShutdown() OVERRIDE;
+      const protocol::TransportRoute& route) override;
+  virtual void OnStart(const std::string& xmpp_login) override;
+  virtual void OnShutdown() override;
 
  private:
   void LogString(WORD type, DWORD event_id, const std::string& string);
diff --git a/remoting/host/host_mock_objects.h b/remoting/host/host_mock_objects.h
index bbddd08..eb35e19 100644
--- a/remoting/host/host_mock_objects.h
+++ b/remoting/host/host_mock_objects.h
@@ -43,14 +43,14 @@ class MockDesktopEnvironment : public DesktopEnvironment {
       protocol::ClientStub* client_stub));
 
   // DesktopEnvironment implementation.
-  virtual scoped_ptr<AudioCapturer> CreateAudioCapturer() OVERRIDE;
-  virtual scoped_ptr<InputInjector> CreateInputInjector() OVERRIDE;
-  virtual scoped_ptr<ScreenControls> CreateScreenControls() OVERRIDE;
-  virtual scoped_ptr<webrtc::DesktopCapturer> CreateVideoCapturer() OVERRIDE;
+  virtual scoped_ptr<AudioCapturer> CreateAudioCapturer() override;
+  virtual scoped_ptr<InputInjector> CreateInputInjector() override;
+  virtual scoped_ptr<ScreenControls> CreateScreenControls() override;
+  virtual scoped_ptr<webrtc::DesktopCapturer> CreateVideoCapturer() override;
   virtual scoped_ptr<GnubbyAuthHandler> CreateGnubbyAuthHandler(
-      protocol::ClientStub* client_stub) OVERRIDE;
+      protocol::ClientStub* client_stub) override;
   virtual scoped_ptr<webrtc::MouseCursorMonitor> CreateMouseCursorMonitor()
-      OVERRIDE;
+      override;
 };
 
 class MockClientSessionControl : public ClientSessionControl {
@@ -96,7 +96,7 @@ class MockDesktopEnvironmentFactory : public DesktopEnvironmentFactory {
   MOCK_CONST_METHOD0(SupportsAudioCapture, bool());
 
   virtual scoped_ptr<DesktopEnvironment> Create(
-      base::WeakPtr<ClientSessionControl> client_session_control) OVERRIDE;
+      base::WeakPtr<ClientSessionControl> client_session_control) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockDesktopEnvironmentFactory);
diff --git a/remoting/host/host_status_logger.h b/remoting/host/host_status_logger.h
index 919cc53..37cc08c 100644
--- a/remoting/host/host_status_logger.h
+++ b/remoting/host/host_status_logger.h
@@ -34,12 +34,12 @@ class HostStatusLogger : public HostStatusObserver,
   void LogSessionStateChange(const std::string& jid, bool connected);
 
   // HostStatusObserver interface.
-  virtual void OnClientConnected(const std::string& jid) OVERRIDE;
-  virtual void OnClientDisconnected(const std::string& jid) OVERRIDE;
+  virtual void OnClientConnected(const std::string& jid) override;
+  virtual void OnClientDisconnected(const std::string& jid) override;
   virtual void OnClientRouteChange(
       const std::string& jid,
       const std::string& channel_name,
-      const protocol::TransportRoute& route) OVERRIDE;
+      const protocol::TransportRoute& route) override;
 
   // Allows test code to fake SignalStrategy state change events.
   void SetSignalingStateForTest(SignalStrategy::State state);
diff --git a/remoting/host/host_status_logger_unittest.cc b/remoting/host/host_status_logger_unittest.cc
index cb23f2a..d2b6fad 100644
--- a/remoting/host/host_status_logger_unittest.cc
+++ b/remoting/host/host_status_logger_unittest.cc
@@ -125,7 +125,7 @@ MATCHER(IsClientDisconnected, "") {
 class HostStatusLoggerTest : public testing::Test {
  public:
   HostStatusLoggerTest() {}
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     message_loop_proxy_ = base::MessageLoopProxy::current();
     EXPECT_CALL(signal_strategy_, AddListener(_));
     host_status_logger_.reset(
diff --git a/remoting/host/host_status_sender.h b/remoting/host/host_status_sender.h
index 14afb75..b3ce5e4 100644
--- a/remoting/host/host_status_sender.h
+++ b/remoting/host/host_status_sender.h
@@ -63,9 +63,9 @@ class HostStatusSender : SignalStrategy::Listener {
 
   // 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;
 
   // APIs for sending host status XMPP messages to the chromoting bot.
   // status: the reason (exit code) why the host is offline.
diff --git a/remoting/host/host_status_sender_unittest.cc b/remoting/host/host_status_sender_unittest.cc
index 15b1147..fe84401 100644
--- a/remoting/host/host_status_sender_unittest.cc
+++ b/remoting/host/host_status_sender_unittest.cc
@@ -41,7 +41,7 @@ const char kTestExitCodeString[] = "INVALID_HOST_CONFIGURATION";
 class HostStatusSenderTest
     : public testing::Test {
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     key_pair_ = RsaKeyPair::FromString(kTestRsaKeyPair);
     ASSERT_TRUE(key_pair_.get());
 
@@ -49,7 +49,7 @@ class HostStatusSenderTest
         kHostId, &signal_strategy_, key_pair_, kTestBotJid));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     host_status_sender_.reset();
   }
 
diff --git a/remoting/host/host_window_proxy.cc b/remoting/host/host_window_proxy.cc
index a7e3d33..6e806d2 100644
--- a/remoting/host/host_window_proxy.cc
+++ b/remoting/host/host_window_proxy.cc
@@ -37,12 +37,12 @@ class HostWindowProxy::Core
   void StopOnUiThread();
 
   // ClientSessionControl interface.
-  virtual const std::string& client_jid() const OVERRIDE;
-  virtual void DisconnectSession() OVERRIDE;
+  virtual const std::string& client_jid() const override;
+  virtual void DisconnectSession() override;
   virtual void OnLocalMouseMoved(
-      const webrtc::DesktopVector& position) OVERRIDE;
-  virtual void SetDisableInputs(bool disable_inputs) OVERRIDE;
-  virtual void ResetVideoPipeline() OVERRIDE;
+      const webrtc::DesktopVector& position) override;
+  virtual void SetDisableInputs(bool disable_inputs) override;
+  virtual void ResetVideoPipeline() override;
 
   // Task runner on which public methods of this class must be called.
   scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner_;
diff --git a/remoting/host/host_window_proxy.h b/remoting/host/host_window_proxy.h
index da6add8..8c4828e 100644
--- a/remoting/host/host_window_proxy.h
+++ b/remoting/host/host_window_proxy.h
@@ -29,7 +29,7 @@ class HostWindowProxy : public HostWindow {
   // HostWindow overrides.
   virtual void Start(
       const base::WeakPtr<ClientSessionControl>& client_session_control)
-      OVERRIDE;
+      override;
 
  private:
   // All thread switching logic is implemented in the ref-counted |Core| class.
diff --git a/remoting/host/in_memory_host_config.h b/remoting/host/in_memory_host_config.h
index 7d5357c..48a9673 100644
--- a/remoting/host/in_memory_host_config.h
+++ b/remoting/host/in_memory_host_config.h
@@ -26,17 +26,17 @@ class InMemoryHostConfig : public MutableHostConfig,
 
   // MutableHostConfig interface.
   virtual bool GetString(const std::string& path,
-                         std::string* out_value) const OVERRIDE;
+                         std::string* out_value) const override;
   virtual bool GetBoolean(const std::string& path,
-                          bool* out_value) const OVERRIDE;
+                          bool* out_value) const override;
 
   virtual void SetString(const std::string& path,
-                         const std::string& in_value) OVERRIDE;
-  virtual void SetBoolean(const std::string& path, bool in_value) OVERRIDE;
+                         const std::string& in_value) override;
+  virtual void SetBoolean(const std::string& path, bool in_value) override;
 
-  virtual bool CopyFrom(const base::DictionaryValue* dictionary) OVERRIDE;
+  virtual bool CopyFrom(const base::DictionaryValue* dictionary) override;
 
-  virtual bool Save() OVERRIDE;
+  virtual bool Save() override;
 
  protected:
   scoped_ptr<base::DictionaryValue> values_;
diff --git a/remoting/host/input_injector_linux.cc b/remoting/host/input_injector_linux.cc
index bcfb022..81eda65 100644
--- a/remoting/host/input_injector_linux.cc
+++ b/remoting/host/input_injector_linux.cc
@@ -97,16 +97,16 @@ class InputInjectorLinux : public InputInjector {
   bool Init();
 
   // Clipboard stub interface.
-  virtual void InjectClipboardEvent(const ClipboardEvent& event) OVERRIDE;
+  virtual void InjectClipboardEvent(const ClipboardEvent& event) override;
 
   // 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;
 
   // InputInjector interface.
   virtual void Start(
-      scoped_ptr<protocol::ClipboardStub> client_clipboard) OVERRIDE;
+      scoped_ptr<protocol::ClipboardStub> client_clipboard) override;
 
  private:
   // The actual implementation resides in InputInjectorLinux::Core class.
diff --git a/remoting/host/input_injector_mac.cc b/remoting/host/input_injector_mac.cc
index 963574f..683fa0b 100644
--- a/remoting/host/input_injector_mac.cc
+++ b/remoting/host/input_injector_mac.cc
@@ -63,16 +63,16 @@ class InputInjectorMac : public InputInjector {
   virtual ~InputInjectorMac();
 
   // ClipboardStub interface.
-  virtual void InjectClipboardEvent(const ClipboardEvent& event) OVERRIDE;
+  virtual void InjectClipboardEvent(const ClipboardEvent& event) override;
 
   // 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;
 
   // InputInjector interface.
   virtual void Start(
-      scoped_ptr<protocol::ClipboardStub> client_clipboard) OVERRIDE;
+      scoped_ptr<protocol::ClipboardStub> client_clipboard) override;
 
  private:
   // The actual implementation resides in InputInjectorMac::Core class.
diff --git a/remoting/host/input_injector_win.cc b/remoting/host/input_injector_win.cc
index 9a8b9f5..30c1cd7 100644
--- a/remoting/host/input_injector_win.cc
+++ b/remoting/host/input_injector_win.cc
@@ -60,16 +60,16 @@ class InputInjectorWin : public InputInjector {
   virtual ~InputInjectorWin();
 
   // ClipboardStub interface.
-  virtual void InjectClipboardEvent(const ClipboardEvent& event) OVERRIDE;
+  virtual void InjectClipboardEvent(const ClipboardEvent& event) override;
 
   // 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;
 
   // InputInjector interface.
   virtual void Start(
-      scoped_ptr<protocol::ClipboardStub> client_clipboard) OVERRIDE;
+      scoped_ptr<protocol::ClipboardStub> client_clipboard) override;
 
  private:
   // The actual implementation resides in InputInjectorWin::Core class.
diff --git a/remoting/host/ipc_audio_capturer.h b/remoting/host/ipc_audio_capturer.h
index 84c8aa3..57d2cad 100644
--- a/remoting/host/ipc_audio_capturer.h
+++ b/remoting/host/ipc_audio_capturer.h
@@ -23,9 +23,9 @@ class IpcAudioCapturer : public AudioCapturer {
   virtual ~IpcAudioCapturer();
 
   // AudioCapturer interface.
-  virtual bool Start(const PacketCapturedCallback& callback) OVERRIDE;
-  virtual void Stop() OVERRIDE;
-  virtual bool IsStarted() OVERRIDE;
+  virtual bool Start(const PacketCapturedCallback& callback) override;
+  virtual void Stop() override;
+  virtual bool IsStarted() override;
 
   // Called by DesktopSessionProxy when an audio packet is received.
   void OnAudioPacket(scoped_ptr<AudioPacket> packet);
diff --git a/remoting/host/ipc_desktop_environment.h b/remoting/host/ipc_desktop_environment.h
index b5f5420..8490780 100644
--- a/remoting/host/ipc_desktop_environment.h
+++ b/remoting/host/ipc_desktop_environment.h
@@ -49,16 +49,16 @@ class IpcDesktopEnvironment : public DesktopEnvironment {
   virtual ~IpcDesktopEnvironment();
 
   // DesktopEnvironment implementation.
-  virtual scoped_ptr<AudioCapturer> CreateAudioCapturer() OVERRIDE;
-  virtual scoped_ptr<InputInjector> CreateInputInjector() OVERRIDE;
-  virtual scoped_ptr<ScreenControls> CreateScreenControls() OVERRIDE;
-  virtual scoped_ptr<webrtc::DesktopCapturer> CreateVideoCapturer() OVERRIDE;
+  virtual scoped_ptr<AudioCapturer> CreateAudioCapturer() override;
+  virtual scoped_ptr<InputInjector> CreateInputInjector() override;
+  virtual scoped_ptr<ScreenControls> CreateScreenControls() override;
+  virtual scoped_ptr<webrtc::DesktopCapturer> CreateVideoCapturer() override;
   virtual scoped_ptr<webrtc::MouseCursorMonitor> CreateMouseCursorMonitor()
-      OVERRIDE;
-  virtual std::string GetCapabilities() const OVERRIDE;
-  virtual void SetCapabilities(const std::string& capabilities) OVERRIDE;
+      override;
+  virtual std::string GetCapabilities() const override;
+  virtual void SetCapabilities(const std::string& capabilities) override;
   virtual scoped_ptr<GnubbyAuthHandler> CreateGnubbyAuthHandler(
-      protocol::ClientStub* client_stub) OVERRIDE;
+      protocol::ClientStub* client_stub) override;
 
  private:
   scoped_refptr<DesktopSessionProxy> desktop_session_proxy_;
@@ -84,25 +84,25 @@ class IpcDesktopEnvironmentFactory
 
   // DesktopEnvironmentFactory implementation.
   virtual scoped_ptr<DesktopEnvironment> Create(
-      base::WeakPtr<ClientSessionControl> client_session_control) OVERRIDE;
-  virtual void SetEnableCurtaining(bool enable) OVERRIDE;
-  virtual bool SupportsAudioCapture() const OVERRIDE;
+      base::WeakPtr<ClientSessionControl> client_session_control) override;
+  virtual void SetEnableCurtaining(bool enable) override;
+  virtual bool SupportsAudioCapture() const override;
 
   // DesktopSessionConnector implementation.
   virtual void ConnectTerminal(
       DesktopSessionProxy* desktop_session_proxy,
       const ScreenResolution& resolution,
-      bool virtual_terminal) OVERRIDE;
+      bool virtual_terminal) override;
   virtual void DisconnectTerminal(
-      DesktopSessionProxy* desktop_session_proxy) OVERRIDE;
+      DesktopSessionProxy* desktop_session_proxy) override;
   virtual void SetScreenResolution(
       DesktopSessionProxy* desktop_session_proxy,
-      const ScreenResolution& resolution) OVERRIDE;
+      const ScreenResolution& resolution) override;
   virtual void OnDesktopSessionAgentAttached(
       int terminal_id,
       base::ProcessHandle desktop_process,
-      IPC::PlatformFileForTransit desktop_pipe) OVERRIDE;
-  virtual void OnTerminalDisconnected(int terminal_id) OVERRIDE;
+      IPC::PlatformFileForTransit desktop_pipe) override;
+  virtual void OnTerminalDisconnected(int terminal_id) override;
 
  private:
   // Used to run the audio capturer.
diff --git a/remoting/host/ipc_desktop_environment_unittest.cc b/remoting/host/ipc_desktop_environment_unittest.cc
index eaa7cfe..e0865cc 100644
--- a/remoting/host/ipc_desktop_environment_unittest.cc
+++ b/remoting/host/ipc_desktop_environment_unittest.cc
@@ -55,7 +55,7 @@ class FakeDaemonSender : public IPC::Sender {
   virtual ~FakeDaemonSender() {}
 
   // IPC::Sender implementation.
-  virtual bool Send(IPC::Message* message) OVERRIDE;
+  virtual bool Send(IPC::Message* message) override;
 
   MOCK_METHOD3(ConnectTerminal, void(int, const ScreenResolution&, bool));
   MOCK_METHOD1(DisconnectTerminal, void(int));
@@ -73,7 +73,7 @@ class MockDaemonListener : public IPC::Listener {
   MockDaemonListener() {}
   virtual ~MockDaemonListener() {}
 
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
   MOCK_METHOD1(OnDesktopAttached, void(IPC::PlatformFileForTransit));
   MOCK_METHOD1(OnChannelConnected, void(int32));
@@ -123,7 +123,7 @@ class IpcDesktopEnvironmentTest : public testing::Test {
   IpcDesktopEnvironmentTest();
   virtual ~IpcDesktopEnvironmentTest();
 
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
   void ConnectTerminal(int terminal_id,
                        const ScreenResolution& resolution,
diff --git a/remoting/host/ipc_host_event_logger.h b/remoting/host/ipc_host_event_logger.h
index 069c4fa..f9e6189 100644
--- a/remoting/host/ipc_host_event_logger.h
+++ b/remoting/host/ipc_host_event_logger.h
@@ -34,16 +34,16 @@ class IpcHostEventLogger
   virtual ~IpcHostEventLogger();
 
   // HostStatusObserver interface.
-  virtual void OnAccessDenied(const std::string& jid) OVERRIDE;
-  virtual void OnClientAuthenticated(const std::string& jid) OVERRIDE;
-  virtual void OnClientConnected(const std::string& jid) OVERRIDE;
-  virtual void OnClientDisconnected(const std::string& jid) OVERRIDE;
+  virtual void OnAccessDenied(const std::string& jid) override;
+  virtual void OnClientAuthenticated(const std::string& jid) override;
+  virtual void OnClientConnected(const std::string& jid) override;
+  virtual void OnClientDisconnected(const std::string& jid) override;
   virtual void OnClientRouteChange(
       const std::string& jid,
       const std::string& channel_name,
-      const protocol::TransportRoute& route) OVERRIDE;
-  virtual void OnStart(const std::string& xmpp_login) OVERRIDE;
-  virtual void OnShutdown() OVERRIDE;
+      const protocol::TransportRoute& route) override;
+  virtual void OnStart(const std::string& xmpp_login) override;
+  virtual void OnShutdown() override;
 
  private:
   // Used to report host status events to the daemon.
diff --git a/remoting/host/ipc_input_injector.h b/remoting/host/ipc_input_injector.h
index 9174ca3..83fa3b9 100644
--- a/remoting/host/ipc_input_injector.h
+++ b/remoting/host/ipc_input_injector.h
@@ -23,16 +23,16 @@ class IpcInputInjector : public InputInjector {
 
   // ClipboardStub interface.
   virtual void InjectClipboardEvent(
-      const protocol::ClipboardEvent& event) OVERRIDE;
+      const protocol::ClipboardEvent& event) override;
 
   // InputStub interface.
-  virtual void InjectKeyEvent(const protocol::KeyEvent& event) OVERRIDE;
-  virtual void InjectTextEvent(const protocol::TextEvent& event) OVERRIDE;
-  virtual void InjectMouseEvent(const protocol::MouseEvent& event) OVERRIDE;
+  virtual void InjectKeyEvent(const protocol::KeyEvent& event) override;
+  virtual void InjectTextEvent(const protocol::TextEvent& event) override;
+  virtual void InjectMouseEvent(const protocol::MouseEvent& event) override;
 
   // InputInjector interface.
   virtual void Start(
-      scoped_ptr<protocol::ClipboardStub> client_clipboard) OVERRIDE;
+      scoped_ptr<protocol::ClipboardStub> client_clipboard) override;
 
  private:
   // Wraps the IPC channel to the desktop process.
diff --git a/remoting/host/ipc_mouse_cursor_monitor.h b/remoting/host/ipc_mouse_cursor_monitor.h
index c9581781..ee37341 100644
--- a/remoting/host/ipc_mouse_cursor_monitor.h
+++ b/remoting/host/ipc_mouse_cursor_monitor.h
@@ -24,8 +24,8 @@ class IpcMouseCursorMonitor : public webrtc::MouseCursorMonitor {
   virtual ~IpcMouseCursorMonitor();
 
   // webrtc::MouseCursorMonitor interface.
-  virtual void Init(Callback* callback, Mode mode) OVERRIDE;
-  virtual void Capture() OVERRIDE;
+  virtual void Init(Callback* callback, Mode mode) override;
+  virtual void Capture() override;
 
   // Called when the cursor shape has changed.
   void OnMouseCursor(scoped_ptr<webrtc::MouseCursor> cursor);
diff --git a/remoting/host/ipc_screen_controls.h b/remoting/host/ipc_screen_controls.h
index 48daa16..feb4807 100644
--- a/remoting/host/ipc_screen_controls.h
+++ b/remoting/host/ipc_screen_controls.h
@@ -21,7 +21,7 @@ class IpcScreenControls : public ScreenControls {
   virtual ~IpcScreenControls();
 
   // SessionController interface.
-  virtual void SetScreenResolution(const ScreenResolution& resolution) OVERRIDE;
+  virtual void SetScreenResolution(const ScreenResolution& resolution) override;
 
  private:
   // Wraps the IPC channel to the desktop session agent.
diff --git a/remoting/host/ipc_video_frame_capturer.h b/remoting/host/ipc_video_frame_capturer.h
index 396bdd5..db27f98 100644
--- a/remoting/host/ipc_video_frame_capturer.h
+++ b/remoting/host/ipc_video_frame_capturer.h
@@ -23,8 +23,8 @@ class IpcVideoFrameCapturer : public webrtc::DesktopCapturer {
   virtual ~IpcVideoFrameCapturer();
 
   // webrtc::DesktopCapturer interface.
-  virtual void Start(Callback* callback) OVERRIDE;
-  virtual void Capture(const webrtc::DesktopRegion& region) OVERRIDE;
+  virtual void Start(Callback* callback) override;
+  virtual void Capture(const webrtc::DesktopRegion& region) override;
 
   // Called when a video |frame| has been captured.
   void OnCaptureCompleted(scoped_ptr<webrtc::DesktopFrame> frame);
diff --git a/remoting/host/it2me/it2me_host.h b/remoting/host/it2me/it2me_host.h
index c970aad..c24f2d1 100644
--- a/remoting/host/it2me/it2me_host.h
+++ b/remoting/host/it2me/it2me_host.h
@@ -80,9 +80,9 @@ class It2MeHost : public base::RefCountedThreadSafe<It2MeHost>,
   virtual void RequestNatPolicy();
 
   // remoting::HostStatusObserver implementation.
-  virtual void OnAccessDenied(const std::string& jid) OVERRIDE;
-  virtual void OnClientAuthenticated(const std::string& jid) OVERRIDE;
-  virtual void OnClientDisconnected(const std::string& jid) OVERRIDE;
+  virtual void OnAccessDenied(const std::string& jid) override;
+  virtual void OnClientAuthenticated(const std::string& jid) override;
+  virtual void OnClientDisconnected(const std::string& jid) override;
 
   void SetStateForTesting(It2MeHostState state) { SetState(state); }
 
diff --git a/remoting/host/it2me_desktop_environment.h b/remoting/host/it2me_desktop_environment.h
index 368a6ab..eaa7701 100644
--- a/remoting/host/it2me_desktop_environment.h
+++ b/remoting/host/it2me_desktop_environment.h
@@ -52,7 +52,7 @@ class It2MeDesktopEnvironmentFactory : public BasicDesktopEnvironmentFactory {
 
   // DesktopEnvironmentFactory interface.
   virtual scoped_ptr<DesktopEnvironment> Create(
-      base::WeakPtr<ClientSessionControl> client_session_control) OVERRIDE;
+      base::WeakPtr<ClientSessionControl> client_session_control) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(It2MeDesktopEnvironmentFactory);
diff --git a/remoting/host/json_host_config.h b/remoting/host/json_host_config.h
index 6e2237d..9932ae0 100644
--- a/remoting/host/json_host_config.h
+++ b/remoting/host/json_host_config.h
@@ -25,7 +25,7 @@ class JsonHostConfig : public InMemoryHostConfig {
   virtual bool Read();
 
   // MutableHostConfig interface.
-  virtual bool Save() OVERRIDE;
+  virtual bool Save() override;
 
   std::string GetSerializedData();
 
diff --git a/remoting/host/linux/audio_pipe_reader.h b/remoting/host/linux/audio_pipe_reader.h
index 45c0d86..949736c 100644
--- a/remoting/host/linux/audio_pipe_reader.h
+++ b/remoting/host/linux/audio_pipe_reader.h
@@ -52,8 +52,8 @@ class AudioPipeReader
   void RemoveObserver(StreamObserver* observer);
 
   // MessageLoopForIO::Watcher interface.
-  virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE;
-  virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE;
+  virtual void OnFileCanReadWithoutBlocking(int fd) override;
+  virtual void OnFileCanWriteWithoutBlocking(int fd) override;
 
  private:
   friend class base::DeleteHelper<AudioPipeReader>;
diff --git a/remoting/host/linux/audio_pipe_reader_unittest.cc b/remoting/host/linux/audio_pipe_reader_unittest.cc
index fb87949..69913bf 100644
--- a/remoting/host/linux/audio_pipe_reader_unittest.cc
+++ b/remoting/host/linux/audio_pipe_reader_unittest.cc
@@ -25,7 +25,7 @@ class AudioPipeReaderTest : public testing::Test,
     : stop_at_position_(-1) {
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ASSERT_TRUE(test_dir_.CreateUniqueTempDir());
     pipe_path_ = test_dir_.path().AppendASCII("test_pipe");
     audio_thread_.reset(new base::Thread("TestAudioThread"));
@@ -37,7 +37,7 @@ class AudioPipeReaderTest : public testing::Test,
   }
 
   // AudioPipeReader::StreamObserver interface.
-  virtual void OnDataRead(scoped_refptr<base::RefCountedString> data) OVERRIDE {
+  virtual void OnDataRead(scoped_refptr<base::RefCountedString> data) override {
     read_data_ += data->data();
     if (stop_at_position_ > 0 &&
         static_cast<int>(read_data_.size()) >= stop_at_position_) {
diff --git a/remoting/host/linux/x_server_clipboard_unittest.cc b/remoting/host/linux/x_server_clipboard_unittest.cc
index beb7f61..57ca4157 100644
--- a/remoting/host/linux/x_server_clipboard_unittest.cc
+++ b/remoting/host/linux/x_server_clipboard_unittest.cc
@@ -67,7 +67,7 @@ class ClipboardTestClient {
 
 class XServerClipboardTest : public testing::Test {
  public:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     // XSynchronize() ensures that PumpXEvents() fully processes all X server
     // requests and responses before returning to the caller.
     Display* display1 = XOpenDisplay(NULL);
@@ -78,7 +78,7 @@ class XServerClipboardTest : public testing::Test {
     client2_.Init(display2);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     XCloseDisplay(client1_.display());
     XCloseDisplay(client2_.display());
   }
diff --git a/remoting/host/local_input_monitor_linux.cc b/remoting/host/local_input_monitor_linux.cc
index 02431a1..da38872 100644
--- a/remoting/host/local_input_monitor_linux.cc
+++ b/remoting/host/local_input_monitor_linux.cc
@@ -62,8 +62,8 @@ class LocalInputMonitorLinux : public base::NonThreadSafe,
     void StopOnInputThread();
 
     // base::MessagePumpLibevent::Watcher interface.
-    virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE;
-    virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE;
+    virtual void OnFileCanReadWithoutBlocking(int fd) override;
+    virtual void OnFileCanWriteWithoutBlocking(int fd) override;
 
     // Processes key and mouse events.
     void ProcessXEvent(xEvent* event);
diff --git a/remoting/host/local_input_monitor_mac.mm b/remoting/host/local_input_monitor_mac.mm
index a5163a8..8ffdb72 100644
--- a/remoting/host/local_input_monitor_mac.mm
+++ b/remoting/host/local_input_monitor_mac.mm
@@ -175,8 +175,8 @@ class LocalInputMonitorMac::Core
 
   // EventHandler interface.
   virtual void OnLocalMouseMoved(
-      const webrtc::DesktopVector& position) OVERRIDE;
-  virtual void OnDisconnectShortcut() OVERRIDE;
+      const webrtc::DesktopVector& position) override;
+  virtual void OnDisconnectShortcut() override;
 
   // Task runner on which public methods of this class must be called.
   scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner_;
diff --git a/remoting/host/local_input_monitor_unittest.cc b/remoting/host/local_input_monitor_unittest.cc
index b1d9c72..df21b93 100644
--- a/remoting/host/local_input_monitor_unittest.cc
+++ b/remoting/host/local_input_monitor_unittest.cc
@@ -36,7 +36,7 @@ class LocalInputMonitorTest : public testing::Test {
  public:
   LocalInputMonitorTest();
 
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
   base::MessageLoop message_loop_;
   base::RunLoop run_loop_;
diff --git a/remoting/host/me2me_desktop_environment.h b/remoting/host/me2me_desktop_environment.h
index f5f31e6..95b3f22 100644
--- a/remoting/host/me2me_desktop_environment.h
+++ b/remoting/host/me2me_desktop_environment.h
@@ -20,10 +20,10 @@ class Me2MeDesktopEnvironment : public BasicDesktopEnvironment {
   virtual ~Me2MeDesktopEnvironment();
 
   // DesktopEnvironment interface.
-  virtual scoped_ptr<ScreenControls> CreateScreenControls() OVERRIDE;
-  virtual std::string GetCapabilities() const OVERRIDE;
+  virtual scoped_ptr<ScreenControls> CreateScreenControls() override;
+  virtual std::string GetCapabilities() const override;
   virtual scoped_ptr<GnubbyAuthHandler> CreateGnubbyAuthHandler(
-      protocol::ClientStub* client_stub) OVERRIDE;
+      protocol::ClientStub* client_stub) override;
 
  protected:
   friend class Me2MeDesktopEnvironmentFactory;
@@ -68,9 +68,9 @@ class Me2MeDesktopEnvironmentFactory : public BasicDesktopEnvironmentFactory {
 
   // DesktopEnvironmentFactory interface.
   virtual scoped_ptr<DesktopEnvironment> Create(
-      base::WeakPtr<ClientSessionControl> client_session_control) OVERRIDE;
-  virtual void SetEnableCurtaining(bool enable) OVERRIDE;
-  virtual void SetEnableGnubbyAuth(bool enable) OVERRIDE;
+      base::WeakPtr<ClientSessionControl> client_session_control) override;
+  virtual void SetEnableCurtaining(bool enable) override;
+  virtual void SetEnableGnubbyAuth(bool enable) override;
 
  protected:
   bool curtain_enabled() const { return curtain_enabled_; }
diff --git a/remoting/host/mouse_clamping_filter.h b/remoting/host/mouse_clamping_filter.h
index 5d5a71c..ebe6cf9 100644
--- a/remoting/host/mouse_clamping_filter.h
+++ b/remoting/host/mouse_clamping_filter.h
@@ -27,7 +27,7 @@ class MouseClampingFilter : public protocol::VideoStub {
 
   // protocol::VideoStub implementation.
   virtual void ProcessVideoPacket(scoped_ptr<VideoPacket> video_packet,
-                                  const base::Closure& done) OVERRIDE;
+                                  const base::Closure& done) override;
 
  private:
   // Clamps mouse event coordinates to the video dimensions.
diff --git a/remoting/host/native_messaging/native_messaging_reader_unittest.cc b/remoting/host/native_messaging/native_messaging_reader_unittest.cc
index 96ad18f..9611c11 100644
--- a/remoting/host/native_messaging/native_messaging_reader_unittest.cc
+++ b/remoting/host/native_messaging/native_messaging_reader_unittest.cc
@@ -20,7 +20,7 @@ class NativeMessagingReaderTest : public testing::Test {
   NativeMessagingReaderTest();
   virtual ~NativeMessagingReaderTest();
 
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
   // Starts the reader and runs the MessageLoop to completion.
   void Run();
diff --git a/remoting/host/native_messaging/native_messaging_writer_unittest.cc b/remoting/host/native_messaging/native_messaging_writer_unittest.cc
index df9158f..da9be71 100644
--- a/remoting/host/native_messaging/native_messaging_writer_unittest.cc
+++ b/remoting/host/native_messaging/native_messaging_writer_unittest.cc
@@ -19,7 +19,7 @@ class NativeMessagingWriterTest : public testing::Test {
   NativeMessagingWriterTest();
   virtual ~NativeMessagingWriterTest();
 
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
  protected:
   scoped_ptr<NativeMessagingWriter> writer_;
diff --git a/remoting/host/native_messaging/pipe_messaging_channel.h b/remoting/host/native_messaging/pipe_messaging_channel.h
index 76dfa5f..fef1dac 100644
--- a/remoting/host/native_messaging/pipe_messaging_channel.h
+++ b/remoting/host/native_messaging/pipe_messaging_channel.h
@@ -38,8 +38,8 @@ class PipeMessagingChannel : public extensions::NativeMessagingChannel,
   virtual ~PipeMessagingChannel();
 
   // extensions::NativeMessagingChannel implementation.
-  virtual void Start(EventHandler* event_handler) OVERRIDE;
-  virtual void SendMessage(scoped_ptr<base::Value> message) OVERRIDE;
+  virtual void Start(EventHandler* event_handler) override;
+  virtual void SendMessage(scoped_ptr<base::Value> message) override;
 
  private:
   // Processes a message received from the client app.
diff --git a/remoting/host/oauth_token_getter.h b/remoting/host/oauth_token_getter.h
index a47a3f8..ffc1355 100644
--- a/remoting/host/oauth_token_getter.h
+++ b/remoting/host/oauth_token_getter.h
@@ -68,12 +68,12 @@ class OAuthTokenGetter :
   // gaia::GaiaOAuthClient::Delegate interface.
   virtual void OnGetTokensResponse(const std::string& user_email,
                                    const std::string& access_token,
-                                   int expires_seconds) OVERRIDE;
+                                   int expires_seconds) override;
   virtual void OnRefreshTokenResponse(const std::string& access_token,
-                                      int expires_in_seconds) OVERRIDE;
-  virtual void OnGetUserEmailResponse(const std::string& user_email) OVERRIDE;
-  virtual void OnOAuthError() OVERRIDE;
-  virtual void OnNetworkError(int response_code) OVERRIDE;
+                                      int expires_in_seconds) override;
+  virtual void OnGetUserEmailResponse(const std::string& user_email) override;
+  virtual void OnOAuthError() override;
+  virtual void OnNetworkError(int response_code) override;
 
  private:
   void NotifyCallbacks(Status status,
diff --git a/remoting/host/pairing_registry_delegate_linux.h b/remoting/host/pairing_registry_delegate_linux.h
index 491f310..293b28f 100644
--- a/remoting/host/pairing_registry_delegate_linux.h
+++ b/remoting/host/pairing_registry_delegate_linux.h
@@ -22,12 +22,12 @@ class PairingRegistryDelegateLinux
   virtual ~PairingRegistryDelegateLinux();
 
   // PairingRegistry::Delegate interface
-  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:
   FRIEND_TEST_ALL_PREFIXES(PairingRegistryDelegateLinuxTest, SaveAndLoad);
diff --git a/remoting/host/pairing_registry_delegate_linux_unittest.cc b/remoting/host/pairing_registry_delegate_linux_unittest.cc
index 5770503..5b7f4ab 100644
--- a/remoting/host/pairing_registry_delegate_linux_unittest.cc
+++ b/remoting/host/pairing_registry_delegate_linux_unittest.cc
@@ -15,7 +15,7 @@ using protocol::PairingRegistry;
 
 class PairingRegistryDelegateLinuxTest : public testing::Test {
  public:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     // Create a temporary directory in order to get a unique name and use a
     // subdirectory to ensure that PairingRegistryDelegateLinux::Save() creates
     // the parent directory if it doesn't exist.
@@ -23,7 +23,7 @@ class PairingRegistryDelegateLinuxTest : public testing::Test {
     temp_registry_ = temp_dir_.Append("paired-clients");
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     base::DeleteFile(temp_dir_, true);
   }
 
diff --git a/remoting/host/pairing_registry_delegate_win.h b/remoting/host/pairing_registry_delegate_win.h
index 93ce5cb..7c75025 100644
--- a/remoting/host/pairing_registry_delegate_win.h
+++ b/remoting/host/pairing_registry_delegate_win.h
@@ -52,12 +52,12 @@ class PairingRegistryDelegateWin
   bool SetRootKeys(HKEY privileged, HKEY unprivileged);
 
   // PairingRegistry::Delegate interface
-  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:
   base::win::RegKey privileged_;
diff --git a/remoting/host/pairing_registry_delegate_win_unittest.cc b/remoting/host/pairing_registry_delegate_win_unittest.cc
index 991ac8f..2577946 100644
--- a/remoting/host/pairing_registry_delegate_win_unittest.cc
+++ b/remoting/host/pairing_registry_delegate_win_unittest.cc
@@ -18,7 +18,7 @@ using protocol::PairingRegistry;
 
 class PairingRegistryDelegateWinTest : public testing::Test {
  public:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     key_name_ = base::GenerateGUID();
 
     base::win::RegKey root;
@@ -32,7 +32,7 @@ class PairingRegistryDelegateWinTest : public testing::Test {
                                      KEY_READ | KEY_WRITE) == ERROR_SUCCESS);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     privileged_.Close();
     unprivileged_.Close();
     EXPECT_TRUE(
diff --git a/remoting/host/pam_authorization_factory_posix.cc b/remoting/host/pam_authorization_factory_posix.cc
index 9409ac0..9e675c5 100644
--- a/remoting/host/pam_authorization_factory_posix.cc
+++ b/remoting/host/pam_authorization_factory_posix.cc
@@ -23,14 +23,14 @@ class PamAuthorizer : public protocol::Authenticator {
   virtual ~PamAuthorizer();
 
   // protocol::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<protocol::ChannelAuthenticator>
-      CreateChannelAuthenticator() const OVERRIDE;
+      CreateChannelAuthenticator() const override;
 
  private:
   void MaybeCheckLocalLogin();
diff --git a/remoting/host/pam_authorization_factory_posix.h b/remoting/host/pam_authorization_factory_posix.h
index 7219698..7931dcf 100644
--- a/remoting/host/pam_authorization_factory_posix.h
+++ b/remoting/host/pam_authorization_factory_posix.h
@@ -23,7 +23,7 @@ class PamAuthorizationFactory : public protocol::AuthenticatorFactory {
   virtual scoped_ptr<protocol::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:
   scoped_ptr<protocol::AuthenticatorFactory> underlying_;
diff --git a/remoting/host/policy_hack/fake_policy_watcher.h b/remoting/host/policy_hack/fake_policy_watcher.h
index baec959..2543f9c 100644
--- a/remoting/host/policy_hack/fake_policy_watcher.h
+++ b/remoting/host/policy_hack/fake_policy_watcher.h
@@ -19,9 +19,9 @@ class FakePolicyWatcher : public PolicyWatcher {
   void SetPolicies(const base::DictionaryValue* policies);
 
  protected:
-  virtual void StartWatchingInternal() OVERRIDE;
-  virtual void StopWatchingInternal() OVERRIDE;
-  virtual void Reload() OVERRIDE;
+  virtual void StartWatchingInternal() override;
+  virtual void StopWatchingInternal() override;
+  virtual void Reload() override;
 };
 
 }  // namespace policy_hack
diff --git a/remoting/host/policy_hack/policy_watcher_linux.cc b/remoting/host/policy_hack/policy_watcher_linux.cc
index 75a6541..d67b49b 100644
--- a/remoting/host/policy_hack/policy_watcher_linux.cc
+++ b/remoting/host/policy_hack/policy_watcher_linux.cc
@@ -57,7 +57,7 @@ class PolicyWatcherLinux : public PolicyWatcher {
   virtual ~PolicyWatcherLinux() {}
 
  protected:
-  virtual void StartWatchingInternal() OVERRIDE {
+  virtual void StartWatchingInternal() override {
     DCHECK(OnPolicyWatcherThread());
     watcher_.reset(new base::FilePathWatcher());
 
@@ -77,7 +77,7 @@ class PolicyWatcherLinux : public PolicyWatcher {
     ScheduleFallbackReloadTask();
   }
 
-  virtual void StopWatchingInternal() OVERRIDE {
+  virtual void StopWatchingInternal() override {
     DCHECK(OnPolicyWatcherThread());
 
     // Stop watching for changes to files in the policies directory.
@@ -162,7 +162,7 @@ class PolicyWatcherLinux : public PolicyWatcher {
     return policy.Pass();
   }
 
-  virtual void Reload() OVERRIDE {
+  virtual void Reload() override {
     DCHECK(OnPolicyWatcherThread());
     // Check the directory time in order to see whether a reload is required.
     base::TimeDelta delay;
diff --git a/remoting/host/policy_hack/policy_watcher_mac.mm b/remoting/host/policy_hack/policy_watcher_mac.mm
index 64e7ab0..c5c3a4d 100644
--- a/remoting/host/policy_hack/policy_watcher_mac.mm
+++ b/remoting/host/policy_hack/policy_watcher_mac.mm
@@ -32,14 +32,14 @@ class PolicyWatcherMac : public PolicyWatcher {
   }
 
  protected:
-  virtual void StartWatchingInternal() OVERRIDE {
+  virtual void StartWatchingInternal() override {
     Reload();
   }
 
-  virtual void StopWatchingInternal() OVERRIDE {
+  virtual void StopWatchingInternal() override {
   }
 
-  virtual void Reload() OVERRIDE {
+  virtual void Reload() override {
     DCHECK(OnPolicyWatcherThread());
     base::DictionaryValue policy;
 
diff --git a/remoting/host/policy_hack/policy_watcher_unittest.cc b/remoting/host/policy_hack/policy_watcher_unittest.cc
index 0ed1a55..b19d92f 100644
--- a/remoting/host/policy_hack/policy_watcher_unittest.cc
+++ b/remoting/host/policy_hack/policy_watcher_unittest.cc
@@ -22,7 +22,7 @@ class PolicyWatcherTest : public testing::Test {
   PolicyWatcherTest() {
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     message_loop_proxy_ = base::MessageLoopProxy::current();
     policy_callback_ = base::Bind(&MockPolicyCallback::OnPolicyUpdate,
                                   base::Unretained(&mock_policy_callback_));
diff --git a/remoting/host/policy_hack/policy_watcher_win.cc b/remoting/host/policy_hack/policy_watcher_win.cc
index 89816d4..cea8516 100644
--- a/remoting/host/policy_hack/policy_watcher_win.cc
+++ b/remoting/host/policy_hack/policy_watcher_win.cc
@@ -54,7 +54,7 @@ class PolicyWatcherWin :
   virtual ~PolicyWatcherWin() {
   }
 
-  virtual void StartWatchingInternal() OVERRIDE {
+  virtual void StartWatchingInternal() override {
     DCHECK(OnPolicyWatcherThread());
 
     if (!RegisterGPNotification(user_policy_changed_event_.handle(), false)) {
@@ -70,7 +70,7 @@ class PolicyWatcherWin :
     Reload();
   }
 
-  virtual void StopWatchingInternal() OVERRIDE {
+  virtual void StopWatchingInternal() override {
     DCHECK(OnPolicyWatcherThread());
 
     if (!UnregisterGPNotification(user_policy_changed_event_.handle())) {
diff --git a/remoting/host/posix/signal_handler.cc b/remoting/host/posix/signal_handler.cc
index 05364f8..7c5e96a 100644
--- a/remoting/host/posix/signal_handler.cc
+++ b/remoting/host/posix/signal_handler.cc
@@ -27,8 +27,8 @@ class SignalListener : public base::MessagePumpLibevent::Watcher {
 
   void AddSignalHandler(int signal, const SignalHandler& handler);
 
-  virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE;
-  virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE {}
+  virtual void OnFileCanReadWithoutBlocking(int fd) override;
+  virtual void OnFileCanWriteWithoutBlocking(int fd) override {}
 
   // WatchFileDescriptor needs a controller through which the operation can be
   // canceled. We don't use it, but this is as good a place as any to store it.
diff --git a/remoting/host/register_support_host_request.h b/remoting/host/register_support_host_request.h
index 925b3f3..afc4643 100644
--- a/remoting/host/register_support_host_request.h
+++ b/remoting/host/register_support_host_request.h
@@ -54,9 +54,9 @@ class RegisterSupportHostRequest : public SignalStrategy::Listener {
 
   // HostStatusObserver implementation.
   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:
   void DoSend();
diff --git a/remoting/host/remote_input_filter.h b/remoting/host/remote_input_filter.h
index 0c26af6..35e92d0 100644
--- a/remoting/host/remote_input_filter.h
+++ b/remoting/host/remote_input_filter.h
@@ -33,9 +33,9 @@ class RemoteInputFilter : public protocol::InputStub {
   void SetExpectLocalEcho(bool expect_local_echo);
 
   // InputStub overrides.
-  virtual void InjectKeyEvent(const protocol::KeyEvent& event) OVERRIDE;
-  virtual void InjectTextEvent(const protocol::TextEvent& event) OVERRIDE;
-  virtual void InjectMouseEvent(const protocol::MouseEvent& event) OVERRIDE;
+  virtual void InjectKeyEvent(const protocol::KeyEvent& event) override;
+  virtual void InjectTextEvent(const protocol::TextEvent& event) override;
+  virtual void InjectMouseEvent(const protocol::MouseEvent& event) override;
 
  private:
   bool ShouldIgnoreInput() const;
diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc
index d4eab21..6aa6b1e2 100644
--- a/remoting/host/remoting_me2me_host.cc
+++ b/remoting/host/remoting_me2me_host.cc
@@ -152,19 +152,19 @@ class HostProcess
               int* exit_code_out);
 
   // ConfigWatcher::Delegate interface.
-  virtual void OnConfigUpdated(const std::string& serialized_config) OVERRIDE;
-  virtual void OnConfigWatcherError() OVERRIDE;
+  virtual void OnConfigUpdated(const std::string& serialized_config) override;
+  virtual void OnConfigWatcherError() override;
 
   // IPC::Listener implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
-  virtual void OnChannelError() OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
+  virtual void OnChannelError() override;
 
   // HeartbeatSender::Listener overrides.
-  virtual void OnHeartbeatSuccessful() OVERRIDE;
-  virtual void OnUnknownHostIdError() OVERRIDE;
+  virtual void OnHeartbeatSuccessful() override;
+  virtual void OnUnknownHostIdError() override;
 
   // HostChangeNotificationListener::Listener overrides.
-  virtual void OnHostDeleted() OVERRIDE;
+  virtual void OnHostDeleted() override;
 
   // Initializes the pairing registry on Windows.
   void OnInitializePairingRegistry(
diff --git a/remoting/host/resizing_host_observer.h b/remoting/host/resizing_host_observer.h
index c6ad714..bcd36a1 100644
--- a/remoting/host/resizing_host_observer.h
+++ b/remoting/host/resizing_host_observer.h
@@ -31,7 +31,7 @@ class ResizingHostObserver : public ScreenControls {
   virtual ~ResizingHostObserver();
 
   // ScreenControls interface.
-  virtual void SetScreenResolution(const ScreenResolution& resolution) OVERRIDE;
+  virtual void SetScreenResolution(const ScreenResolution& resolution) override;
 
   // Provide a replacement for base::Time::Now so that this class can be
   // unit-tested in a timely manner. This function will be called exactly
diff --git a/remoting/host/resizing_host_observer_unittest.cc b/remoting/host/resizing_host_observer_unittest.cc
index 1c8cea0..aefb390 100644
--- a/remoting/host/resizing_host_observer_unittest.cc
+++ b/remoting/host/resizing_host_observer_unittest.cc
@@ -58,22 +58,22 @@ class FakeDesktopResizer : public DesktopResizer {
   int set_resolution_call_count() { return set_resolution_call_count_; }
 
   // remoting::DesktopResizer interface
-  virtual ScreenResolution GetCurrentResolution() OVERRIDE {
+  virtual ScreenResolution GetCurrentResolution() override {
     return current_resolution_;
   }
   virtual std::list<ScreenResolution> GetSupportedResolutions(
-      const ScreenResolution& preferred) OVERRIDE {
+      const ScreenResolution& preferred) override {
     std::list<ScreenResolution> result = supported_resolutions_;
     if (exact_size_supported_) {
       result.push_back(preferred);
     }
     return result;
   }
-  virtual void SetResolution(const ScreenResolution& resolution) OVERRIDE {
+  virtual void SetResolution(const ScreenResolution& resolution) override {
     current_resolution_ = resolution;
     ++set_resolution_call_count_;
   }
-  virtual void RestoreResolution(const ScreenResolution& resolution) OVERRIDE {
+  virtual void RestoreResolution(const ScreenResolution& resolution) override {
     current_resolution_ = resolution;
     if (restore_resolution_call_count_)
       ++(*restore_resolution_call_count_);
diff --git a/remoting/host/sas_injector_win.cc b/remoting/host/sas_injector_win.cc
index ca8286d..eb48ed2 100644
--- a/remoting/host/sas_injector_win.cc
+++ b/remoting/host/sas_injector_win.cc
@@ -112,7 +112,7 @@ class SasInjectorWin : public SasInjector {
   virtual ~SasInjectorWin();
 
   // SasInjector implementation.
-  virtual bool InjectSas() OVERRIDE;
+  virtual bool InjectSas() override;
 
  private:
   base::ScopedNativeLibrary sas_dll_;
@@ -128,7 +128,7 @@ class SasInjectorXp : public SasInjector {
   virtual ~SasInjectorXp();
 
   // SasInjector implementation.
-  virtual bool InjectSas() OVERRIDE;
+  virtual bool InjectSas() override;
 };
 
 SasInjectorWin::SasInjectorWin() : send_sas_(NULL) {
diff --git a/remoting/host/setup/daemon_controller_delegate_linux.h b/remoting/host/setup/daemon_controller_delegate_linux.h
index d16ec0c..145318c 100644
--- a/remoting/host/setup/daemon_controller_delegate_linux.h
+++ b/remoting/host/setup/daemon_controller_delegate_linux.h
@@ -16,21 +16,21 @@ class DaemonControllerDelegateLinux : public DaemonController::Delegate {
   virtual ~DaemonControllerDelegateLinux();
 
   // DaemonController::Delegate interface.
-  virtual DaemonController::State GetState() OVERRIDE;
-  virtual scoped_ptr<base::DictionaryValue> GetConfig() OVERRIDE;
+  virtual DaemonController::State GetState() override;
+  virtual scoped_ptr<base::DictionaryValue> GetConfig() override;
   virtual void InstallHost(
-      const DaemonController::CompletionCallback& done) OVERRIDE;
+      const DaemonController::CompletionCallback& done) override;
   virtual void SetConfigAndStart(
       scoped_ptr<base::DictionaryValue> config,
       bool consent,
-      const DaemonController::CompletionCallback& done) OVERRIDE;
+      const DaemonController::CompletionCallback& done) override;
   virtual void UpdateConfig(
       scoped_ptr<base::DictionaryValue> config,
-      const DaemonController::CompletionCallback& done) OVERRIDE;
-  virtual void Stop(const DaemonController::CompletionCallback& done) OVERRIDE;
-  virtual void SetWindow(void* window_handle) OVERRIDE;
-  virtual std::string GetVersion() OVERRIDE;
-  virtual DaemonController::UsageStatsConsent GetUsageStatsConsent() OVERRIDE;
+      const DaemonController::CompletionCallback& done) override;
+  virtual void Stop(const DaemonController::CompletionCallback& done) override;
+  virtual void SetWindow(void* window_handle) override;
+  virtual std::string GetVersion() override;
+  virtual DaemonController::UsageStatsConsent GetUsageStatsConsent() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DaemonControllerDelegateLinux);
diff --git a/remoting/host/setup/daemon_controller_delegate_mac.h b/remoting/host/setup/daemon_controller_delegate_mac.h
index 8b65d40..8a881d9 100644
--- a/remoting/host/setup/daemon_controller_delegate_mac.h
+++ b/remoting/host/setup/daemon_controller_delegate_mac.h
@@ -17,21 +17,21 @@ class DaemonControllerDelegateMac : public DaemonController::Delegate {
   virtual ~DaemonControllerDelegateMac();
 
   // DaemonController::Delegate interface.
-  virtual DaemonController::State GetState() OVERRIDE;
-  virtual scoped_ptr<base::DictionaryValue> GetConfig() OVERRIDE;
+  virtual DaemonController::State GetState() override;
+  virtual scoped_ptr<base::DictionaryValue> GetConfig() override;
   virtual void InstallHost(
-      const DaemonController::CompletionCallback& done) OVERRIDE;
+      const DaemonController::CompletionCallback& done) override;
   virtual void SetConfigAndStart(
       scoped_ptr<base::DictionaryValue> config,
       bool consent,
-      const DaemonController::CompletionCallback& done) OVERRIDE;
+      const DaemonController::CompletionCallback& done) override;
   virtual void UpdateConfig(
       scoped_ptr<base::DictionaryValue> config,
-      const DaemonController::CompletionCallback& done) OVERRIDE;
-  virtual void Stop(const DaemonController::CompletionCallback& done) OVERRIDE;
-  virtual void SetWindow(void* window_handle) OVERRIDE;
-  virtual std::string GetVersion() OVERRIDE;
-  virtual DaemonController::UsageStatsConsent GetUsageStatsConsent() OVERRIDE;
+      const DaemonController::CompletionCallback& done) override;
+  virtual void Stop(const DaemonController::CompletionCallback& done) override;
+  virtual void SetWindow(void* window_handle) override;
+  virtual std::string GetVersion() override;
+  virtual DaemonController::UsageStatsConsent GetUsageStatsConsent() override;
 
  private:
   void ShowPreferencePane(const std::string& config_data,
diff --git a/remoting/host/setup/daemon_controller_delegate_win.h b/remoting/host/setup/daemon_controller_delegate_win.h
index b3dd45b..9ffafb1 100644
--- a/remoting/host/setup/daemon_controller_delegate_win.h
+++ b/remoting/host/setup/daemon_controller_delegate_win.h
@@ -23,21 +23,21 @@ class DaemonControllerDelegateWin : public DaemonController::Delegate {
   virtual ~DaemonControllerDelegateWin();
 
   // DaemonController::Delegate interface.
-  virtual DaemonController::State GetState() OVERRIDE;
-  virtual scoped_ptr<base::DictionaryValue> GetConfig() OVERRIDE;
+  virtual DaemonController::State GetState() override;
+  virtual scoped_ptr<base::DictionaryValue> GetConfig() override;
   virtual void InstallHost(
-      const DaemonController::CompletionCallback& done) OVERRIDE;
+      const DaemonController::CompletionCallback& done) override;
   virtual void SetConfigAndStart(
       scoped_ptr<base::DictionaryValue> config,
       bool consent,
-      const DaemonController::CompletionCallback& done) OVERRIDE;
+      const DaemonController::CompletionCallback& done) override;
   virtual void UpdateConfig(
       scoped_ptr<base::DictionaryValue> config,
-      const DaemonController::CompletionCallback& done) OVERRIDE;
-  virtual void Stop(const DaemonController::CompletionCallback& done) OVERRIDE;
-  virtual void SetWindow(void* window_handle) OVERRIDE;
-  virtual std::string GetVersion() OVERRIDE;
-  virtual DaemonController::UsageStatsConsent GetUsageStatsConsent() OVERRIDE;
+      const DaemonController::CompletionCallback& done) override;
+  virtual void Stop(const DaemonController::CompletionCallback& done) override;
+  virtual void SetWindow(void* window_handle) override;
+  virtual std::string GetVersion() override;
+  virtual DaemonController::UsageStatsConsent GetUsageStatsConsent() override;
 
  private:
   // Activates an unprivileged instance of the daemon controller and caches it.
diff --git a/remoting/host/setup/daemon_installer_win.cc b/remoting/host/setup/daemon_installer_win.cc
index c20d464..39f2986 100644
--- a/remoting/host/setup/daemon_installer_win.cc
+++ b/remoting/host/setup/daemon_installer_win.cc
@@ -70,7 +70,7 @@ class DaemonComInstallerWin : public DaemonInstallerWin {
                         const CompletionCallback& done);
 
   // DaemonInstallerWin implementation.
-  virtual void Install() OVERRIDE;
+  virtual void Install() override;
 
  private:
   // Polls the installation status performing state-specific actions (such as
@@ -95,10 +95,10 @@ class DaemonCommandLineInstallerWin
   ~DaemonCommandLineInstallerWin();
 
   // DaemonInstallerWin implementation.
-  virtual void Install() OVERRIDE;
+  virtual void Install() override;
 
   // base::win::ObjectWatcher::Delegate implementation.
-  virtual void OnObjectSignaled(HANDLE object) OVERRIDE;
+  virtual void OnObjectSignaled(HANDLE object) override;
 
  private:
   // Handle of the launched process.
diff --git a/remoting/host/setup/host_starter.h b/remoting/host/setup/host_starter.h
index 1570315..d990509 100644
--- a/remoting/host/setup/host_starter.h
+++ b/remoting/host/setup/host_starter.h
@@ -54,21 +54,21 @@ class HostStarter : public gaia::GaiaOAuthClient::Delegate,
   // gaia::GaiaOAuthClient::Delegate
   virtual void OnGetTokensResponse(const std::string& refresh_token,
                                    const std::string& access_token,
-                                   int expires_in_seconds) OVERRIDE;
+                                   int expires_in_seconds) override;
   virtual void OnRefreshTokenResponse(const std::string& access_token,
-                                      int expires_in_seconds) OVERRIDE;
-  virtual void OnGetUserEmailResponse(const std::string& user_email) OVERRIDE;
+                                      int expires_in_seconds) override;
+  virtual void OnGetUserEmailResponse(const std::string& user_email) override;
 
   // remoting::ServiceClient::Delegate
-  virtual void OnHostRegistered(const std::string& authorization_code) OVERRIDE;
-  virtual void OnHostUnregistered() OVERRIDE;
+  virtual void OnHostRegistered(const std::string& authorization_code) override;
+  virtual void OnHostUnregistered() override;
 
   // TODO(sergeyu): Following methods are members of all three delegate
   // interfaces implemented in this class. Fix ServiceClient and
   // GaiaUserEmailFetcher so that Delegate interfaces do not overlap (ideally
   // they should be changed to use Callback<>).
-  virtual void OnOAuthError() OVERRIDE;
-  virtual void OnNetworkError(int response_code) OVERRIDE;
+  virtual void OnOAuthError() override;
+  virtual void OnNetworkError(int response_code) override;
 
  private:
   HostStarter(scoped_ptr<gaia::GaiaOAuthClient> oauth_client,
diff --git a/remoting/host/setup/me2me_native_messaging_host.h b/remoting/host/setup/me2me_native_messaging_host.h
index 5c93872..507e682 100644
--- a/remoting/host/setup/me2me_native_messaging_host.h
+++ b/remoting/host/setup/me2me_native_messaging_host.h
@@ -49,8 +49,8 @@ class Me2MeNativeMessagingHost
   void Start(const base::Closure& quit_closure);
 
   // extensions::NativeMessagingChannel::EventHandler implementation
-  virtual void OnMessage(scoped_ptr<base::Value> message) OVERRIDE;
-  virtual void OnDisconnect() OVERRIDE;
+  virtual void OnMessage(scoped_ptr<base::Value> message) override;
+  virtual void OnDisconnect() override;
 
  private:
   // These "Process.." methods handle specific request types. The |response|
@@ -135,8 +135,8 @@ class Me2MeNativeMessagingHost
    public:
     ElevatedChannelEventHandler(Me2MeNativeMessagingHost* host);
 
-    virtual void OnMessage(scoped_ptr<base::Value> message) OVERRIDE;
-    virtual void OnDisconnect() OVERRIDE;
+    virtual void OnMessage(scoped_ptr<base::Value> message) override;
+    virtual void OnDisconnect() override;
    private:
     Me2MeNativeMessagingHost* parent_;
   };
diff --git a/remoting/host/setup/me2me_native_messaging_host_unittest.cc b/remoting/host/setup/me2me_native_messaging_host_unittest.cc
index 51bee6b..93391a3 100644
--- a/remoting/host/setup/me2me_native_messaging_host_unittest.cc
+++ b/remoting/host/setup/me2me_native_messaging_host_unittest.cc
@@ -138,21 +138,21 @@ class MockDaemonControllerDelegate : public DaemonController::Delegate {
   virtual ~MockDaemonControllerDelegate();
 
   // DaemonController::Delegate interface.
-  virtual DaemonController::State GetState() OVERRIDE;
-  virtual scoped_ptr<base::DictionaryValue> GetConfig() OVERRIDE;
+  virtual DaemonController::State GetState() override;
+  virtual scoped_ptr<base::DictionaryValue> GetConfig() override;
   virtual void InstallHost(
-      const DaemonController::CompletionCallback& done) OVERRIDE;
+      const DaemonController::CompletionCallback& done) override;
   virtual void SetConfigAndStart(
       scoped_ptr<base::DictionaryValue> config,
       bool consent,
-      const DaemonController::CompletionCallback& done) OVERRIDE;
+      const DaemonController::CompletionCallback& done) override;
   virtual void UpdateConfig(
       scoped_ptr<base::DictionaryValue> config,
-      const DaemonController::CompletionCallback& done) OVERRIDE;
-  virtual void Stop(const DaemonController::CompletionCallback& done) OVERRIDE;
-  virtual void SetWindow(void* window_handle) OVERRIDE;
-  virtual std::string GetVersion() OVERRIDE;
-  virtual DaemonController::UsageStatsConsent GetUsageStatsConsent() OVERRIDE;
+      const DaemonController::CompletionCallback& done) override;
+  virtual void Stop(const DaemonController::CompletionCallback& done) override;
+  virtual void SetWindow(void* window_handle) override;
+  virtual std::string GetVersion() override;
+  virtual DaemonController::UsageStatsConsent GetUsageStatsConsent() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockDaemonControllerDelegate);
@@ -226,8 +226,8 @@ class Me2MeNativeMessagingHostTest : public testing::Test {
   Me2MeNativeMessagingHostTest();
   virtual ~Me2MeNativeMessagingHostTest();
 
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
   scoped_ptr<base::DictionaryValue> ReadMessageFromOutputPipe();
 
diff --git a/remoting/host/setup/oauth_client.h b/remoting/host/setup/oauth_client.h
index 54bd48ce..b704dcd 100644
--- a/remoting/host/setup/oauth_client.h
+++ b/remoting/host/setup/oauth_client.h
@@ -49,13 +49,13 @@ class OAuthClient : public gaia::GaiaOAuthClient::Delegate {
   // gaia::GaiaOAuthClient::Delegate
   virtual void OnGetTokensResponse(const std::string& refresh_token,
                                  const std::string& access_token,
-                                 int expires_in_seconds) OVERRIDE;
+                                 int expires_in_seconds) override;
   virtual void OnRefreshTokenResponse(const std::string& access_token,
-                                      int expires_in_seconds) OVERRIDE;
-  virtual void OnGetUserEmailResponse(const std::string& user_email) OVERRIDE;
+                                      int expires_in_seconds) override;
+  virtual void OnGetUserEmailResponse(const std::string& user_email) override;
 
-  virtual void OnOAuthError() OVERRIDE;
-  virtual void OnNetworkError(int response_code) OVERRIDE;
+  virtual void OnOAuthError() override;
+  virtual void OnNetworkError(int response_code) override;
 
  private:
   struct Request {
diff --git a/remoting/host/setup/service_client.cc b/remoting/host/setup/service_client.cc
index 0e7996c..7c4d4b4 100644
--- a/remoting/host/setup/service_client.cc
+++ b/remoting/host/setup/service_client.cc
@@ -40,7 +40,7 @@ class ServiceClient::Core
                       ServiceClient::Delegate* delegate);
 
   // net::URLFetcherDelegate implementation.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
 
  private:
   friend class base::RefCountedThreadSafe<Core>;
diff --git a/remoting/host/shaped_desktop_capturer.h b/remoting/host/shaped_desktop_capturer.h
index a497439..a9a964c 100644
--- a/remoting/host/shaped_desktop_capturer.h
+++ b/remoting/host/shaped_desktop_capturer.h
@@ -21,13 +21,13 @@ class ShapedDesktopCapturer : public webrtc::DesktopCapturer,
   virtual ~ShapedDesktopCapturer();
 
   // webrtc::DesktopCapturer interface.
-  virtual void Start(webrtc::DesktopCapturer::Callback* callback) OVERRIDE;
-  virtual void Capture(const webrtc::DesktopRegion& region) OVERRIDE;
+  virtual void Start(webrtc::DesktopCapturer::Callback* callback) override;
+  virtual void Capture(const webrtc::DesktopRegion& region) override;
 
  private:
   // webrtc::DesktopCapturer::Callback interface.
-  virtual webrtc::SharedMemory* CreateSharedMemory(size_t size) OVERRIDE;
-  virtual void OnCaptureCompleted(webrtc::DesktopFrame* frame) OVERRIDE;
+  virtual webrtc::SharedMemory* CreateSharedMemory(size_t size) override;
+  virtual void OnCaptureCompleted(webrtc::DesktopFrame* frame) override;
 
   scoped_ptr<webrtc::DesktopCapturer> desktop_capturer_;
   scoped_ptr<DesktopShapeTracker> shape_tracker_;
diff --git a/remoting/host/shaped_desktop_capturer_unittest.cc b/remoting/host/shaped_desktop_capturer_unittest.cc
index 08d78f4..3289240 100644
--- a/remoting/host/shaped_desktop_capturer_unittest.cc
+++ b/remoting/host/shaped_desktop_capturer_unittest.cc
@@ -25,11 +25,11 @@ class FakeDesktopShapeTracker : public DesktopShapeTracker {
     return result;
   }
 
-  virtual void RefreshDesktopShape() OVERRIDE {
+  virtual void RefreshDesktopShape() override {
     shape_ = CreateShape();
   }
 
-  virtual const webrtc::DesktopRegion& desktop_shape() OVERRIDE {
+  virtual const webrtc::DesktopRegion& desktop_shape() override {
     // desktop_shape() can't be called before RefreshDesktopShape().
     EXPECT_FALSE(shape_.is_empty());
     return shape_;
@@ -43,11 +43,11 @@ class ShapedDesktopCapturerTest : public testing::Test,
                                  public webrtc::DesktopCapturer::Callback {
  public:
   // webrtc::DesktopCapturer::Callback interface
-  virtual webrtc::SharedMemory* CreateSharedMemory(size_t size) OVERRIDE {
+  virtual webrtc::SharedMemory* CreateSharedMemory(size_t size) override {
     return NULL;
   }
 
-  virtual void OnCaptureCompleted(webrtc::DesktopFrame* frame) OVERRIDE {
+  virtual void OnCaptureCompleted(webrtc::DesktopFrame* frame) override {
     last_frame_.reset(frame);
   }
 
diff --git a/remoting/host/signaling_connector.h b/remoting/host/signaling_connector.h
index a0912f1..4447cf4 100644
--- a/remoting/host/signaling_connector.h
+++ b/remoting/host/signaling_connector.h
@@ -49,16 +49,16 @@ class SignalingConnector
 
   // 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;
 
   // NetworkChangeNotifier::ConnectionTypeObserver interface.
   virtual void OnConnectionTypeChanged(
-      net::NetworkChangeNotifier::ConnectionType type) OVERRIDE;
+      net::NetworkChangeNotifier::ConnectionType type) override;
 
   // NetworkChangeNotifier::IPAddressObserver interface.
-  virtual void OnIPAddressChanged() OVERRIDE;
+  virtual void OnIPAddressChanged() override;
 
  private:
   void OnNetworkError();
diff --git a/remoting/host/single_window_desktop_environment.cc b/remoting/host/single_window_desktop_environment.cc
index acb2c01..f764651 100644
--- a/remoting/host/single_window_desktop_environment.cc
+++ b/remoting/host/single_window_desktop_environment.cc
@@ -19,8 +19,8 @@ class SingleWindowDesktopEnvironment : public BasicDesktopEnvironment {
   virtual ~SingleWindowDesktopEnvironment();
 
   // DesktopEnvironment interface.
-  virtual scoped_ptr<webrtc::DesktopCapturer> CreateVideoCapturer() OVERRIDE;
-  virtual scoped_ptr<InputInjector> CreateInputInjector() OVERRIDE;
+  virtual scoped_ptr<webrtc::DesktopCapturer> CreateVideoCapturer() override;
+  virtual scoped_ptr<InputInjector> CreateInputInjector() override;
 
  protected:
   friend class SingleWindowDesktopEnvironmentFactory;
diff --git a/remoting/host/single_window_desktop_environment.h b/remoting/host/single_window_desktop_environment.h
index eee773e..b8e86d0 100644
--- a/remoting/host/single_window_desktop_environment.h
+++ b/remoting/host/single_window_desktop_environment.h
@@ -24,7 +24,7 @@ class SingleWindowDesktopEnvironmentFactory
 
   // DesktopEnvironmentFactory interface.
   virtual scoped_ptr<DesktopEnvironment> Create(
-      base::WeakPtr<ClientSessionControl> client_session_control) OVERRIDE;
+      base::WeakPtr<ClientSessionControl> client_session_control) override;
 
  private:
   webrtc::WindowId window_id_;
diff --git a/remoting/host/single_window_input_injector_mac.cc b/remoting/host/single_window_input_injector_mac.cc
index ab0c095..fc24eac 100644
--- a/remoting/host/single_window_input_injector_mac.cc
+++ b/remoting/host/single_window_input_injector_mac.cc
@@ -28,11 +28,11 @@ class SingleWindowInputInjectorMac : public SingleWindowInputInjector {
 
   // InputInjector interface.
   virtual void Start(
-      scoped_ptr<protocol::ClipboardStub> client_clipboard) OVERRIDE;
-  virtual void InjectKeyEvent(const KeyEvent& event) OVERRIDE;
-  virtual void InjectTextEvent(const TextEvent& event) OVERRIDE;
-  virtual void InjectMouseEvent(const MouseEvent& event) OVERRIDE;
-  virtual void InjectClipboardEvent(const ClipboardEvent& event) OVERRIDE;
+      scoped_ptr<protocol::ClipboardStub> client_clipboard) override;
+  virtual void InjectKeyEvent(const KeyEvent& event) override;
+  virtual void InjectTextEvent(const TextEvent& event) override;
+  virtual void InjectMouseEvent(const MouseEvent& event) override;
+  virtual void InjectClipboardEvent(const ClipboardEvent& event) override;
 
  private:
   CGRect FindCGRectOfWindow();
diff --git a/remoting/host/token_validator_base.h b/remoting/host/token_validator_base.h
index cd73afa..e67cb00 100644
--- a/remoting/host/token_validator_base.h
+++ b/remoting/host/token_validator_base.h
@@ -47,18 +47,18 @@ class TokenValidatorBase
   virtual void ValidateThirdPartyToken(
       const std::string& token,
       const base::Callback<void(
-          const std::string& shared_secret)>& on_token_validated) OVERRIDE;
+          const std::string& shared_secret)>& on_token_validated) override;
 
-  virtual const GURL& token_url() const OVERRIDE;
-  virtual const std::string& token_scope() const OVERRIDE;
+  virtual const GURL& token_url() const override;
+  virtual const std::string& token_scope() const override;
 
   // URLRequest::Delegate interface.
-  virtual void OnResponseStarted(net::URLRequest* source) OVERRIDE;
+  virtual void OnResponseStarted(net::URLRequest* source) override;
   virtual void OnReadCompleted(net::URLRequest* source,
-                               int bytes_read) OVERRIDE;
+                               int bytes_read) override;
   virtual void OnCertificateRequested(
       net::URLRequest* source,
-      net::SSLCertRequestInfo* cert_request_info) OVERRIDE;
+      net::SSLCertRequestInfo* cert_request_info) override;
 
  protected:
   void OnCertificatesSelected(net::CertificateList* selected_certs,
diff --git a/remoting/host/token_validator_factory_impl.cc b/remoting/host/token_validator_factory_impl.cc
index 62ccbeb..1d2d011 100644
--- a/remoting/host/token_validator_factory_impl.cc
+++ b/remoting/host/token_validator_factory_impl.cc
@@ -45,7 +45,7 @@ class TokenValidatorImpl : public TokenValidatorBase {
       scoped_refptr<net::URLRequestContextGetter> request_context_getter);
 
  protected:
-  virtual void StartValidateRequest(const std::string& token) OVERRIDE;
+  virtual void StartValidateRequest(const std::string& token) override;
 
  private:
   static std::string CreateScope(const std::string& local_jid,
diff --git a/remoting/host/token_validator_factory_impl.h b/remoting/host/token_validator_factory_impl.h
index 10ffd64..d06bf36 100644
--- a/remoting/host/token_validator_factory_impl.h
+++ b/remoting/host/token_validator_factory_impl.h
@@ -33,7 +33,7 @@ class TokenValidatorFactoryImpl : public protocol::TokenValidatorFactory {
   // TokenValidatorFactory interface.
   virtual scoped_ptr<protocol::TokenValidator> CreateTokenValidator(
       const std::string& local_jid,
-      const std::string& remote_jid) OVERRIDE;
+      const std::string& remote_jid) override;
 
  private:
   ThirdPartyAuthConfig third_party_auth_config_;
diff --git a/remoting/host/token_validator_factory_impl_unittest.cc b/remoting/host/token_validator_factory_impl_unittest.cc
index 81ad1db..5f8ea49 100644
--- a/remoting/host/token_validator_factory_impl_unittest.cc
+++ b/remoting/host/token_validator_factory_impl_unittest.cc
@@ -42,7 +42,7 @@ class FakeProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler {
   }
   virtual net::URLRequestJob* MaybeCreateJob(
       net::URLRequest* request, net::NetworkDelegate* network_delegate) const
-      OVERRIDE {
+      override {
     return new net::URLRequestTestJob(
         request, network_delegate, headers_, response_, true);
   }
@@ -88,7 +88,7 @@ class TokenValidatorFactoryImplTest : public testing::Test {
   }
 
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     key_pair_ = RsaKeyPair::FromString(kTestRsaKeyPair);
     scoped_ptr<net::TestURLRequestContext> context(
         new SetResponseURLRequestContext());
diff --git a/remoting/host/video_frame_recorder.cc b/remoting/host/video_frame_recorder.cc
index 4e3df47..1ec900c 100644
--- a/remoting/host/video_frame_recorder.cc
+++ b/remoting/host/video_frame_recorder.cc
@@ -38,10 +38,10 @@ class VideoFrameRecorder::RecordingVideoEncoder : public VideoEncoder {
   }
 
   // remoting::VideoEncoder interface.
-  virtual void SetLosslessEncode(bool want_lossless) OVERRIDE;
-  virtual void SetLosslessColor(bool want_lossless) OVERRIDE;
+  virtual void SetLosslessEncode(bool want_lossless) override;
+  virtual void SetLosslessColor(bool want_lossless) override;
   virtual scoped_ptr<VideoPacket> Encode(
-      const webrtc::DesktopFrame& frame) OVERRIDE;
+      const webrtc::DesktopFrame& frame) override;
 
  private:
   scoped_ptr<VideoEncoder> encoder_;
diff --git a/remoting/host/video_frame_recorder_host_extension.cc b/remoting/host/video_frame_recorder_host_extension.cc
index 0528ce2..e405cef 100644
--- a/remoting/host/video_frame_recorder_host_extension.cc
+++ b/remoting/host/video_frame_recorder_host_extension.cc
@@ -31,12 +31,12 @@ class VideoFrameRecorderHostExtensionSession : public HostExtensionSession {
   virtual ~VideoFrameRecorderHostExtensionSession();
 
   // remoting::HostExtensionSession interface.
-  virtual void OnCreateVideoEncoder(scoped_ptr<VideoEncoder>* encoder) OVERRIDE;
-  virtual bool ModifiesVideoPipeline() const OVERRIDE;
+  virtual void OnCreateVideoEncoder(scoped_ptr<VideoEncoder>* encoder) override;
+  virtual bool ModifiesVideoPipeline() const override;
   virtual bool OnExtensionMessage(
       ClientSessionControl* client_session_control,
       protocol::ClientStub* client_stub,
-      const protocol::ExtensionMessage& message) OVERRIDE;
+      const protocol::ExtensionMessage& message) override;
 
  private:
   // Handlers for the different frame recorder extension message types.
diff --git a/remoting/host/video_frame_recorder_host_extension.h b/remoting/host/video_frame_recorder_host_extension.h
index 8bac525..ff2ff4e 100644
--- a/remoting/host/video_frame_recorder_host_extension.h
+++ b/remoting/host/video_frame_recorder_host_extension.h
@@ -22,10 +22,10 @@ class VideoFrameRecorderHostExtension : public HostExtension {
   void SetMaxContentBytes(int64_t max_content_bytes);
 
   // remoting::HostExtension interface.
-  virtual std::string capability() const OVERRIDE;
+  virtual std::string capability() const override;
   virtual scoped_ptr<HostExtensionSession> CreateExtensionSession(
       ClientSessionControl* client_session,
-      protocol::ClientStub* client_stub) OVERRIDE;
+      protocol::ClientStub* client_stub) override;
 
  private:
   int64_t max_content_bytes_;
diff --git a/remoting/host/video_frame_recorder_unittest.cc b/remoting/host/video_frame_recorder_unittest.cc
index e288135..f4ea260 100644
--- a/remoting/host/video_frame_recorder_unittest.cc
+++ b/remoting/host/video_frame_recorder_unittest.cc
@@ -52,8 +52,8 @@ class VideoFrameRecorderTest : public testing::Test {
  public:
   VideoFrameRecorderTest();
 
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
   // Creates a new VideoEncoder, wraps it using |recorder_|, and stores the
   // newly wrapped encoder in |encoder_|.
diff --git a/remoting/host/video_scheduler.h b/remoting/host/video_scheduler.h
index 13ef218..795e8e2 100644
--- a/remoting/host/video_scheduler.h
+++ b/remoting/host/video_scheduler.h
@@ -95,15 +95,15 @@ class VideoScheduler : public base::RefCountedThreadSafe<VideoScheduler>,
       protocol::VideoStub* video_stub);
 
   // webrtc::DesktopCapturer::Callback implementation.
-  virtual webrtc::SharedMemory* CreateSharedMemory(size_t size) OVERRIDE;
-  virtual void OnCaptureCompleted(webrtc::DesktopFrame* frame) OVERRIDE;
+  virtual webrtc::SharedMemory* CreateSharedMemory(size_t size) override;
+  virtual void OnCaptureCompleted(webrtc::DesktopFrame* frame) override;
 
   // webrtc::MouseCursorMonitor::Callback implementation.
   virtual void OnMouseCursor(
-      webrtc::MouseCursor* mouse_cursor) OVERRIDE;
+      webrtc::MouseCursor* mouse_cursor) override;
   virtual void OnMouseCursorPosition(
       webrtc::MouseCursorMonitor::CursorState state,
-      const webrtc::DesktopVector& position) OVERRIDE;
+      const webrtc::DesktopVector& position) override;
 
   // Starts scheduling frame captures.
   void Start();
diff --git a/remoting/host/video_scheduler_unittest.cc b/remoting/host/video_scheduler_unittest.cc
index 2acaa8a..9234d67 100644
--- a/remoting/host/video_scheduler_unittest.cc
+++ b/remoting/host/video_scheduler_unittest.cc
@@ -127,8 +127,8 @@ class VideoSchedulerTest : public testing::Test {
  public:
   VideoSchedulerTest();
 
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
   void StartVideoScheduler(
       scoped_ptr<webrtc::DesktopCapturer> capturer,
diff --git a/remoting/host/win/chromoting_module.h b/remoting/host/win/chromoting_module.h
index 2c7f1aa..d124516 100644
--- a/remoting/host/win/chromoting_module.h
+++ b/remoting/host/win/chromoting_module.h
@@ -47,7 +47,7 @@ class ChromotingModule : public ATL::CAtlModuleT<ChromotingModule> {
   bool Run();
 
   // ATL::CAtlModuleT<> overrides
-  virtual LONG Unlock() OVERRIDE;
+  virtual LONG Unlock() override;
 
   DECLARE_LIBID(LIBID_ChromotingLib)
 
diff --git a/remoting/host/win/host_service.h b/remoting/host/win/host_service.h
index ccd92f7..96cfff2 100644
--- a/remoting/host/win/host_service.h
+++ b/remoting/host/win/host_service.h
@@ -38,9 +38,9 @@ class HostService : public WtsTerminalMonitor {
 
   // WtsTerminalMonitor implementation
   virtual bool AddWtsTerminalObserver(const std::string& terminal_id,
-                                      WtsTerminalObserver* observer) OVERRIDE;
+                                      WtsTerminalObserver* observer) override;
   virtual void RemoveWtsTerminalObserver(
-      WtsTerminalObserver* observer) OVERRIDE;
+      WtsTerminalObserver* observer) override;
 
  private:
   HostService();
diff --git a/remoting/host/win/rdp_client.cc b/remoting/host/win/rdp_client.cc
index ef7f74e..80868da 100644
--- a/remoting/host/win/rdp_client.cc
+++ b/remoting/host/win/rdp_client.cc
@@ -56,8 +56,8 @@ class RdpClient::Core
   void InjectSas();
 
   // RdpClientWindow::EventHandler interface.
-  virtual void OnConnected() OVERRIDE;
-  virtual void OnDisconnected() OVERRIDE;
+  virtual void OnConnected() override;
+  virtual void OnDisconnected() override;
 
  private:
   friend class base::RefCountedThreadSafe<Core>;
diff --git a/remoting/host/win/rdp_client_unittest.cc b/remoting/host/win/rdp_client_unittest.cc
index ac541a1..4ef67b6 100644
--- a/remoting/host/win/rdp_client_unittest.cc
+++ b/remoting/host/win/rdp_client_unittest.cc
@@ -81,8 +81,8 @@ class RdpClientTest : public testing::Test {
   RdpClientTest();
   virtual ~RdpClientTest();
 
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
   // Caaled when an RDP connection is established.
   void OnRdpConnected();
diff --git a/remoting/host/win/rdp_desktop_session.h b/remoting/host/win/rdp_desktop_session.h
index 682c3f5..9f08692 100644
--- a/remoting/host/win/rdp_desktop_session.h
+++ b/remoting/host/win/rdp_desktop_session.h
@@ -49,8 +49,8 @@ class __declspec(uuid(RDP_DESKTOP_SESSION_CLSID)) RdpDesktopSession
 
  private:
   // RdpClient::EventHandler interface.
-  virtual void OnRdpConnected() OVERRIDE;
-  virtual void OnRdpClosed() OVERRIDE;
+  virtual void OnRdpConnected() override;
+  virtual void OnRdpClosed() override;
 
   BEGIN_COM_MAP(RdpDesktopSession)
     COM_INTERFACE_ENTRY(IRdpDesktopSession)
diff --git a/remoting/host/win/session_desktop_environment.h b/remoting/host/win/session_desktop_environment.h
index 7d14413..949fa5e 100644
--- a/remoting/host/win/session_desktop_environment.h
+++ b/remoting/host/win/session_desktop_environment.h
@@ -20,7 +20,7 @@ class SessionDesktopEnvironment : public Me2MeDesktopEnvironment {
   virtual ~SessionDesktopEnvironment();
 
   // DesktopEnvironment implementation.
-  virtual scoped_ptr<InputInjector> CreateInputInjector() OVERRIDE;
+  virtual scoped_ptr<InputInjector> CreateInputInjector() override;
 
  private:
   friend class SessionDesktopEnvironmentFactory;
@@ -48,7 +48,7 @@ class SessionDesktopEnvironmentFactory : public Me2MeDesktopEnvironmentFactory {
 
   // DesktopEnvironmentFactory implementation.
   virtual scoped_ptr<DesktopEnvironment> Create(
-      base::WeakPtr<ClientSessionControl> client_session_control) OVERRIDE;
+      base::WeakPtr<ClientSessionControl> client_session_control) override;
 
  private:
   // Used to ask the daemon to inject Secure Attention Sequence.
diff --git a/remoting/host/win/session_input_injector.cc b/remoting/host/win/session_input_injector.cc
index 2c4ee23..784d0ff 100644
--- a/remoting/host/win/session_input_injector.cc
+++ b/remoting/host/win/session_input_injector.cc
@@ -56,16 +56,16 @@ class SessionInputInjectorWin::Core
 
   // InputInjector implementation.
   virtual void Start(
-      scoped_ptr<protocol::ClipboardStub> client_clipboard) OVERRIDE;
+      scoped_ptr<protocol::ClipboardStub> client_clipboard) override;
 
   // protocol::ClipboardStub implementation.
   virtual void InjectClipboardEvent(
-      const protocol::ClipboardEvent& event) OVERRIDE;
+      const protocol::ClipboardEvent& event) override;
 
   // protocol::InputStub implementation.
-  virtual void InjectKeyEvent(const protocol::KeyEvent& event) OVERRIDE;
-  virtual void InjectTextEvent(const protocol::TextEvent& event) OVERRIDE;
-  virtual void InjectMouseEvent(const protocol::MouseEvent& event) OVERRIDE;
+  virtual void InjectKeyEvent(const protocol::KeyEvent& event) override;
+  virtual void InjectTextEvent(const protocol::TextEvent& event) override;
+  virtual void InjectMouseEvent(const protocol::MouseEvent& event) override;
 
  private:
   friend class base::RefCountedThreadSafe<Core>;
diff --git a/remoting/host/win/session_input_injector.h b/remoting/host/win/session_input_injector.h
index 9c9443c..ce58c94 100644
--- a/remoting/host/win/session_input_injector.h
+++ b/remoting/host/win/session_input_injector.h
@@ -33,16 +33,16 @@ class SessionInputInjectorWin : public InputInjector {
 
   // InputInjector implementation.
   virtual void Start(
-      scoped_ptr<protocol::ClipboardStub> client_clipboard) OVERRIDE;
+      scoped_ptr<protocol::ClipboardStub> client_clipboard) override;
 
   // protocol::ClipboardStub implementation.
   virtual void InjectClipboardEvent(
-      const protocol::ClipboardEvent& event) OVERRIDE;
+      const protocol::ClipboardEvent& event) override;
 
   // protocol::InputStub implementation.
-  virtual void InjectKeyEvent(const protocol::KeyEvent& event) OVERRIDE;
-  virtual void InjectTextEvent(const protocol::TextEvent& event) OVERRIDE;
-  virtual void InjectMouseEvent(const protocol::MouseEvent& event) OVERRIDE;
+  virtual void InjectKeyEvent(const protocol::KeyEvent& event) override;
+  virtual void InjectTextEvent(const protocol::TextEvent& event) override;
+  virtual void InjectMouseEvent(const protocol::MouseEvent& event) override;
 
  private:
   // The actual implementation resides in SessionInputInjectorWin::Core class.
diff --git a/remoting/host/win/unprivileged_process_delegate.h b/remoting/host/win/unprivileged_process_delegate.h
index 435958c..74cd8ea 100644
--- a/remoting/host/win/unprivileged_process_delegate.h
+++ b/remoting/host/win/unprivileged_process_delegate.h
@@ -40,16 +40,16 @@ class UnprivilegedProcessDelegate
   virtual ~UnprivilegedProcessDelegate();
 
   // WorkerProcessLauncher::Delegate implementation.
-  virtual void LaunchProcess(WorkerProcessLauncher* event_handler) OVERRIDE;
-  virtual void Send(IPC::Message* message) OVERRIDE;
-  virtual void CloseChannel() OVERRIDE;
-  virtual void KillProcess() OVERRIDE;
+  virtual void LaunchProcess(WorkerProcessLauncher* event_handler) override;
+  virtual void Send(IPC::Message* message) override;
+  virtual void CloseChannel() override;
+  virtual void KillProcess() override;
 
  private:
   // IPC::Listener implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
-  virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
-  virtual void OnChannelError() OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
+  virtual void OnChannelConnected(int32 peer_pid) override;
+  virtual void OnChannelError() override;
 
   void ReportFatalError();
   void ReportProcessLaunched(base::win::ScopedHandle worker_process);
diff --git a/remoting/host/win/worker_process_launcher.h b/remoting/host/win/worker_process_launcher.h
index 03fd45b..a61b755 100644
--- a/remoting/host/win/worker_process_launcher.h
+++ b/remoting/host/win/worker_process_launcher.h
@@ -102,7 +102,7 @@ class WorkerProcessLauncher
 
   // base::win::ObjectWatcher::Delegate implementation used to watch for
   // the worker process exiting.
-  virtual void OnObjectSignaled(HANDLE object) OVERRIDE;
+  virtual void OnObjectSignaled(HANDLE object) override;
 
   // Returns true when the object is being destroyed.
   bool stopping() const { return ipc_handler_ == NULL; }
diff --git a/remoting/host/win/worker_process_launcher_unittest.cc b/remoting/host/win/worker_process_launcher_unittest.cc
index 0c93a83..e256a7c 100644
--- a/remoting/host/win/worker_process_launcher_unittest.cc
+++ b/remoting/host/win/worker_process_launcher_unittest.cc
@@ -76,7 +76,7 @@ class MockWorkerListener : public IPC::Listener {
   MOCK_METHOD3(OnCrash, void(const std::string&, const std::string&, int));
 
   // IPC::Listener implementation
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockWorkerListener);
@@ -103,13 +103,13 @@ class WorkerProcessLauncherTest
   WorkerProcessLauncherTest();
   virtual ~WorkerProcessLauncherTest();
 
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
   // IPC::Listener implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
-  virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
-  virtual void OnChannelError() OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
+  virtual void OnChannelConnected(int32 peer_pid) override;
+  virtual void OnChannelError() override;
 
   // WorkerProcessLauncher::Delegate mocks
   void LaunchProcess(
diff --git a/remoting/host/win/wts_session_process_delegate.cc b/remoting/host/win/wts_session_process_delegate.cc
index c05ac90..a28ac5a 100644
--- a/remoting/host/win/wts_session_process_delegate.cc
+++ b/remoting/host/win/wts_session_process_delegate.cc
@@ -68,12 +68,12 @@ class WtsSessionProcessDelegate::Core
   // base::MessagePumpForIO::IOHandler implementation.
   virtual void OnIOCompleted(base::MessagePumpForIO::IOContext* context,
                              DWORD bytes_transferred,
-                             DWORD error) OVERRIDE;
+                             DWORD error) override;
 
   // IPC::Listener implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
-  virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
-  virtual void OnChannelError() OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
+  virtual void OnChannelConnected(int32 peer_pid) override;
+  virtual void OnChannelError() override;
 
   // The actual implementation of LaunchProcess()
   void DoLaunchProcess();
diff --git a/remoting/host/win/wts_session_process_delegate.h b/remoting/host/win/wts_session_process_delegate.h
index cfe856e..625c846 100644
--- a/remoting/host/win/wts_session_process_delegate.h
+++ b/remoting/host/win/wts_session_process_delegate.h
@@ -40,10 +40,10 @@ class WtsSessionProcessDelegate
   bool Initialize(uint32 session_id);
 
   // WorkerProcessLauncher::Delegate implementation.
-  virtual void LaunchProcess(WorkerProcessLauncher* event_handler) OVERRIDE;
-  virtual void Send(IPC::Message* message) OVERRIDE;
-  virtual void CloseChannel() OVERRIDE;
-  virtual void KillProcess() OVERRIDE;
+  virtual void LaunchProcess(WorkerProcessLauncher* event_handler) override;
+  virtual void Send(IPC::Message* message) override;
+  virtual void CloseChannel() override;
+  virtual void KillProcess() override;
 
  private:
   // The actual implementation resides in WtsSessionProcessDelegate::Core class.
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);
diff --git a/remoting/signaling/fake_signal_strategy.h b/remoting/signaling/fake_signal_strategy.h
index 05c5ba5..bd316ff 100644
--- a/remoting/signaling/fake_signal_strategy.h
+++ b/remoting/signaling/fake_signal_strategy.h
@@ -39,15 +39,15 @@ class FakeSignalStrategy : public SignalStrategy,
   void ConnectTo(FakeSignalStrategy* peer);
 
   // SignalStrategy interface.
-  virtual void Connect() OVERRIDE;
-  virtual void Disconnect() OVERRIDE;
-  virtual State GetState() const OVERRIDE;
-  virtual Error GetError() const OVERRIDE;
-  virtual std::string GetLocalJid() const OVERRIDE;
-  virtual void AddListener(Listener* listener) OVERRIDE;
-  virtual void RemoveListener(Listener* listener) OVERRIDE;
-  virtual bool SendStanza(scoped_ptr<buzz::XmlElement> stanza) OVERRIDE;
-  virtual std::string GetNextId() OVERRIDE;
+  virtual void Connect() override;
+  virtual void Disconnect() override;
+  virtual State GetState() const override;
+  virtual Error GetError() const override;
+  virtual std::string GetLocalJid() const override;
+  virtual void AddListener(Listener* listener) override;
+  virtual void RemoveListener(Listener* listener) override;
+  virtual bool SendStanza(scoped_ptr<buzz::XmlElement> stanza) override;
+  virtual std::string GetNextId() override;
 
  private:
   typedef base::Callback<void(scoped_ptr<buzz::XmlElement> message)>
diff --git a/remoting/signaling/iq_sender.h b/remoting/signaling/iq_sender.h
index 7c41daa..51879d4 100644
--- a/remoting/signaling/iq_sender.h
+++ b/remoting/signaling/iq_sender.h
@@ -56,9 +56,9 @@ class IqSender : public SignalStrategy::Listener {
 
   // SignalStrategy::Listener implementation.
   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:
   typedef std::map<std::string, IqRequest*> IqRequestMap;
diff --git a/remoting/signaling/log_to_server.h b/remoting/signaling/log_to_server.h
index cfae054..b1647925 100644
--- a/remoting/signaling/log_to_server.h
+++ b/remoting/signaling/log_to_server.h
@@ -34,9 +34,9 @@ class LogToServer : public base::NonThreadSafe,
 
   // 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;
 
   void Log(const ServerLogEntry& entry);
 
diff --git a/remoting/signaling/log_to_server_unittest.cc b/remoting/signaling/log_to_server_unittest.cc
index 01e839b..0c9c78c 100644
--- a/remoting/signaling/log_to_server_unittest.cc
+++ b/remoting/signaling/log_to_server_unittest.cc
@@ -39,7 +39,7 @@ MATCHER_P2(IsLogEntry, key, value, "") {
 class LogToServerTest : public testing::Test {
  public:
   LogToServerTest() {}
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     EXPECT_CALL(signal_strategy_, AddListener(_));
     EXPECT_CALL(signal_strategy_, RemoveListener(_));
     log_to_server_.reset(
diff --git a/remoting/signaling/mock_signal_strategy.h b/remoting/signaling/mock_signal_strategy.h
index ca671e3..c39eba7 100644
--- a/remoting/signaling/mock_signal_strategy.h
+++ b/remoting/signaling/mock_signal_strategy.h
@@ -27,7 +27,7 @@ class MockSignalStrategy : public SignalStrategy {
   // GMock currently doesn't support move-only arguments, so we have
   // to use this hack here.
   MOCK_METHOD1(SendStanzaPtr, bool(buzz::XmlElement* stanza));
-  virtual bool SendStanza(scoped_ptr<buzz::XmlElement> stanza) OVERRIDE {
+  virtual bool SendStanza(scoped_ptr<buzz::XmlElement> stanza) override {
     return SendStanzaPtr(stanza.release());
   }
 };
diff --git a/remoting/signaling/xmpp_signal_strategy.h b/remoting/signaling/xmpp_signal_strategy.h
index 9460e5f..05eb079 100644
--- a/remoting/signaling/xmpp_signal_strategy.h
+++ b/remoting/signaling/xmpp_signal_strategy.h
@@ -60,18 +60,18 @@ class XmppSignalStrategy : public base::NonThreadSafe,
   virtual ~XmppSignalStrategy();
 
   // SignalStrategy interface.
-  virtual void Connect() OVERRIDE;
-  virtual void Disconnect() OVERRIDE;
-  virtual State GetState() const OVERRIDE;
-  virtual Error GetError() const OVERRIDE;
-  virtual std::string GetLocalJid() const OVERRIDE;
-  virtual void AddListener(Listener* listener) OVERRIDE;
-  virtual void RemoveListener(Listener* listener) OVERRIDE;
-  virtual bool SendStanza(scoped_ptr<buzz::XmlElement> stanza) OVERRIDE;
-  virtual std::string GetNextId() OVERRIDE;
+  virtual void Connect() override;
+  virtual void Disconnect() override;
+  virtual State GetState() const override;
+  virtual Error GetError() const override;
+  virtual std::string GetLocalJid() const override;
+  virtual void AddListener(Listener* listener) override;
+  virtual void RemoveListener(Listener* listener) override;
+  virtual bool SendStanza(scoped_ptr<buzz::XmlElement> stanza) override;
+  virtual std::string GetNextId() override;
 
   // buzz::XmppStanzaHandler interface.
-  virtual bool HandleStanza(const buzz::XmlElement* stanza) OVERRIDE;
+  virtual bool HandleStanza(const buzz::XmlElement* stanza) override;
 
   // This method is used to update the auth info (for example when the OAuth
   // access token is renewed). It is OK to call this even when we are in the
diff --git a/remoting/test/fake_network_manager.h b/remoting/test/fake_network_manager.h
index 20788b5..0dea2ba 100644
--- a/remoting/test/fake_network_manager.h
+++ b/remoting/test/fake_network_manager.h
@@ -19,9 +19,9 @@ class FakeNetworkManager : public rtc::NetworkManager {
   virtual ~FakeNetworkManager();
 
   // rtc::NetworkManager interface.
-  virtual void StartUpdating() OVERRIDE;
-  virtual void StopUpdating() OVERRIDE;
-  virtual void GetNetworks(NetworkList* networks) const OVERRIDE;
+  virtual void StartUpdating() override;
+  virtual void StopUpdating() override;
+  virtual void GetNetworks(NetworkList* networks) const override;
 
  protected:
   void SendNetworksChangedSignal();
diff --git a/remoting/test/fake_port_allocator.cc b/remoting/test/fake_port_allocator.cc
index 0a96f1e..45d8f19 100644
--- a/remoting/test/fake_port_allocator.cc
+++ b/remoting/test/fake_port_allocator.cc
@@ -27,8 +27,8 @@ class FakePortAllocatorSession
   virtual ~FakePortAllocatorSession();
 
   // 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;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FakePortAllocatorSession);
diff --git a/remoting/test/fake_port_allocator.h b/remoting/test/fake_port_allocator.h
index 18fd7bd..ca50ae5 100644
--- a/remoting/test/fake_port_allocator.h
+++ b/remoting/test/fake_port_allocator.h
@@ -30,7 +30,7 @@ class FakePortAllocator : 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:
   FakePortAllocator(scoped_ptr<rtc::NetworkManager> network_manager,
diff --git a/remoting/test/fake_socket_factory.cc b/remoting/test/fake_socket_factory.cc
index c9b927d..8bb05b5 100644
--- a/remoting/test/fake_socket_factory.cc
+++ b/remoting/test/fake_socket_factory.cc
@@ -47,19 +47,19 @@ class FakeUdpSocket : public rtc::AsyncPacketSocket {
                      int data_size);
 
   // 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:
   FakePacketSocketFactory* factory_;
diff --git a/remoting/test/fake_socket_factory.h b/remoting/test/fake_socket_factory.h
index c7efdab..02784e8 100644
--- a/remoting/test/fake_socket_factory.h
+++ b/remoting/test/fake_socket_factory.h
@@ -52,27 +52,27 @@ class FakePacketSocketFactory : public rtc::PacketSocketFactory,
   // rtc::PacketSocketFactory interface.
   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;
 
   // FakeNetworkDispatcher::Node interface.
   virtual const scoped_refptr<base::SingleThreadTaskRunner>& GetThread()
-      const OVERRIDE;
-  virtual const rtc::IPAddress& GetAddress() const OVERRIDE;
+      const override;
+  virtual const rtc::IPAddress& GetAddress() const override;
   virtual void ReceivePacket(const rtc::SocketAddress& from,
                              const rtc::SocketAddress& to,
                              const scoped_refptr<net::IOBuffer>& data,
-                             int data_size) OVERRIDE;
+                             int data_size) override;
 
  private:
   struct PendingPacket {
diff --git a/remoting/test/protocol_perftest.cc b/remoting/test/protocol_perftest.cc
index a9cd445..83d015b 100644
--- a/remoting/test/protocol_perftest.cc
+++ b/remoting/test/protocol_perftest.cc
@@ -68,7 +68,7 @@ class FakeCursorShapeStub : public protocol::CursorShapeStub {
 
   // protocol::CursorShapeStub interface.
   virtual void SetCursorShape(
-      const protocol::CursorShapeInfo& cursor_shape) OVERRIDE {};
+      const protocol::CursorShapeInfo& cursor_shape) override {};
 };
 
 class ProtocolPerfTest
@@ -98,34 +98,34 @@ class ProtocolPerfTest
 
   // ClientUserInterface interface.
   virtual void OnConnectionState(protocol::ConnectionToHost::State state,
-                                 protocol::ErrorCode error) OVERRIDE {
+                                 protocol::ErrorCode error) override {
     if (state == protocol::ConnectionToHost::CONNECTED) {
       client_connected_ = true;
       if (host_connected_)
         connecting_loop_->Quit();
     }
   }
-  virtual void OnConnectionReady(bool ready) OVERRIDE {}
+  virtual void OnConnectionReady(bool ready) override {}
   virtual void OnRouteChanged(const std::string& channel_name,
-                              const protocol::TransportRoute& route) OVERRIDE {
+                              const protocol::TransportRoute& route) override {
   }
-  virtual void SetCapabilities(const std::string& capabilities) OVERRIDE {}
+  virtual void SetCapabilities(const std::string& capabilities) override {}
   virtual void SetPairingResponse(
-      const protocol::PairingResponse& pairing_response) OVERRIDE {}
+      const protocol::PairingResponse& pairing_response) override {}
   virtual void DeliverHostMessage(
-      const protocol::ExtensionMessage& message) OVERRIDE {}
-  virtual protocol::ClipboardStub* GetClipboardStub() OVERRIDE {
+      const protocol::ExtensionMessage& message) override {}
+  virtual protocol::ClipboardStub* GetClipboardStub() override {
     return NULL;
   }
-  virtual protocol::CursorShapeStub* GetCursorShapeStub() OVERRIDE {
+  virtual protocol::CursorShapeStub* GetCursorShapeStub() override {
     return &cursor_shape_stub_;
   }
 
   // VideoRenderer interface.
-  virtual void Initialize(const protocol::SessionConfig& config) OVERRIDE {}
-  virtual ChromotingStats* GetStats() OVERRIDE { return NULL; }
+  virtual void Initialize(const protocol::SessionConfig& config) override {}
+  virtual ChromotingStats* GetStats() override { return NULL; }
   virtual void ProcessVideoPacket(scoped_ptr<VideoPacket> video_packet,
-                                  const base::Closure& done) OVERRIDE {
+                                  const base::Closure& done) override {
     if (video_packet->data().empty()) {
       // Ignore keep-alive packets
       done.Run();
@@ -141,7 +141,7 @@ class ProtocolPerfTest
   }
 
   // HostStatusObserver interface.
-  virtual void OnClientConnected(const std::string& jid) OVERRIDE {
+  virtual void OnClientConnected(const std::string& jid) override {
     message_loop_.PostTask(
         FROM_HERE,
         base::Bind(&ProtocolPerfTest::OnHostConnectedMainThread,