Replacing the OVERRIDE with override and FINAL with final in jingle

This step is a giant search and replace for OVERRIDE and FINAL to
replace them with their lowercase versions.

BUG=417463

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

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

30 files changed, 176 insertions, 176 deletions

diff --git a/jingle/glue/channel_socket_adapter.h b/jingle/glue/channel_socket_adapter.h
index 8bd330f..48c4097 100644
--- a/jingle/glue/channel_socket_adapter.h
+++ b/jingle/glue/channel_socket_adapter.h
@@ -44,12 +44,12 @@ class TransportChannelSocketAdapter : public net::Socket,
 
   // 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;
+                    const net::CompletionCallback& callback) override;
 
-  virtual int SetReceiveBufferSize(int32 size) OVERRIDE;
-  virtual int SetSendBufferSize(int32 size) OVERRIDE;
+  virtual int SetReceiveBufferSize(int32 size) override;
+  virtual int SetSendBufferSize(int32 size) override;
 
  private:
   void OnNewPacket(cricket::TransportChannel* channel,
diff --git a/jingle/glue/chrome_async_socket.h b/jingle/glue/chrome_async_socket.h
index 18c83ca..e05f9c6 100644
--- a/jingle/glue/chrome_async_socket.h
+++ b/jingle/glue/chrome_async_socket.h
@@ -47,16 +47,16 @@ class ChromeAsyncSocket : public buzz::AsyncSocket {
 
   // The current state (see buzz::AsyncSocket::State; all but
   // STATE_CLOSING is used).
-  virtual State state() OVERRIDE;
+  virtual State state() override;
 
   // The last generated error.  Errors are generated when the main
   // functions below return false or when SignalClosed is raised due
   // to an asynchronous error.
-  virtual Error error() OVERRIDE;
+  virtual Error error() override;
 
   // GetError() (which is of type net::Error) != net::OK only when
   // error() == ERROR_WINSOCK.
-  virtual int GetError() OVERRIDE;
+  virtual int GetError() override;
 
   // Tries to connect to the given address.
   //
@@ -72,7 +72,7 @@ class ChromeAsyncSocket : public buzz::AsyncSocket {
   // Otherwise, starts the connection process and returns true.
   // SignalConnected will be raised when the connection is successful;
   // otherwise, SignalClosed will be raised with a net error set.
-  virtual bool Connect(const rtc::SocketAddress& address) OVERRIDE;
+  virtual bool Connect(const rtc::SocketAddress& address) override;
 
   // Tries to read at most |len| bytes into |data|.
   //
@@ -85,7 +85,7 @@ class ChromeAsyncSocket : public buzz::AsyncSocket {
   // case because StartTls() is called during a slot connected to
   // SignalRead after parsing the final non-TLS reply from the server
   // [see XmppClient::Private::OnSocketRead()].)
-  virtual bool Read(char* data, size_t len, size_t* len_read) OVERRIDE;
+  virtual bool Read(char* data, size_t len, size_t* len_read) override;
 
   // Queues up |len| bytes of |data| for writing.
   //
@@ -104,11 +104,11 @@ class ChromeAsyncSocket : public buzz::AsyncSocket {
   // Note that there's no guarantee that the data will actually be
   // sent; however, it is guaranteed that the any data sent will be
   // sent in FIFO order.
-  virtual bool Write(const char* data, size_t len) OVERRIDE;
+  virtual bool Write(const char* data, size_t len) override;
 
   // If the socket is not already closed, closes the socket and raises
   // SignalClosed.  Always returns true.
-  virtual bool Close() OVERRIDE;
+  virtual bool Close() override;
 
   // Tries to change to a TLS connection with the given domain name.
   //
@@ -121,7 +121,7 @@ class ChromeAsyncSocket : public buzz::AsyncSocket {
   // SignalSSLConnected will be raised when the connection is
   // successful; otherwise, SignalClosed will be raised with a net
   // error set.
-  virtual bool StartTls(const std::string& domain_name) OVERRIDE;
+  virtual bool StartTls(const std::string& domain_name) override;
 
   // Signal behavior:
   //
diff --git a/jingle/glue/chrome_async_socket_unittest.cc b/jingle/glue/chrome_async_socket_unittest.cc
index a26c136..e04b608 100644
--- a/jingle/glue/chrome_async_socket_unittest.cc
+++ b/jingle/glue/chrome_async_socket_unittest.cc
@@ -43,7 +43,7 @@ class AsyncSocketDataProvider : public net::SocketDataProvider {
 
   // If there's no read, sets the "has pending read" flag.  Otherwise,
   // pops the next read.
-  virtual net::MockRead GetNextRead() OVERRIDE {
+  virtual net::MockRead GetNextRead() override {
     if (reads_.empty()) {
       DCHECK(!has_pending_read_);
       has_pending_read_ = true;
@@ -57,7 +57,7 @@ class AsyncSocketDataProvider : public net::SocketDataProvider {
 
   // Simply pops the next write and, if applicable, compares it to
   // |data|.
-  virtual net::MockWriteResult OnWrite(const std::string& data) OVERRIDE {
+  virtual net::MockWriteResult OnWrite(const std::string& data) override {
     DCHECK(!writes_.empty());
     net::MockWrite mock_write = writes_.front();
     writes_.pop_front();
@@ -74,7 +74,7 @@ class AsyncSocketDataProvider : public net::SocketDataProvider {
 
   // We ignore resets so we can pre-load the socket data provider with
   // read/write events.
-  virtual void Reset() OVERRIDE {}
+  virtual void Reset() override {}
 
   // If there is a pending read, completes it with the given read.
   // Otherwise, queues up the given read.
@@ -115,14 +115,14 @@ class MockXmppClientSocketFactory : public ResolvingClientSocketFactory {
 
   // ResolvingClientSocketFactory implementation.
   virtual scoped_ptr<net::StreamSocket> CreateTransportClientSocket(
-      const net::HostPortPair& host_and_port) OVERRIDE {
+      const net::HostPortPair& host_and_port) override {
     return mock_client_socket_factory_->CreateTransportClientSocket(
         address_list_, NULL, net::NetLog::Source());
   }
 
   virtual scoped_ptr<net::SSLClientSocket> CreateSSLClientSocket(
       scoped_ptr<net::ClientSocketHandle> transport_socket,
-      const net::HostPortPair& host_and_port) OVERRIDE {
+      const net::HostPortPair& host_and_port) override {
     net::SSLClientSocketContext context;
     context.cert_verifier = cert_verifier_.get();
     context.transport_security_state = transport_security_state_.get();
diff --git a/jingle/glue/fake_ssl_client_socket.h b/jingle/glue/fake_ssl_client_socket.h
index 41000f7..a27caa7 100644
--- a/jingle/glue/fake_ssl_client_socket.h
+++ b/jingle/glue/fake_ssl_client_socket.h
@@ -46,25 +46,25 @@ class FakeSSLClientSocket : public net::StreamSocket {
 
   // net::StreamSocket 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;
-  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;
+                    const net::CompletionCallback& callback) override;
+  virtual int SetReceiveBufferSize(int32 size) override;
+  virtual int SetSendBufferSize(int32 size) 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:
   enum HandshakeState {
diff --git a/jingle/glue/proxy_resolving_client_socket.h b/jingle/glue/proxy_resolving_client_socket.h
index 58bbdba4..27a01c3 100644
--- a/jingle/glue/proxy_resolving_client_socket.h
+++ b/jingle/glue/proxy_resolving_client_socket.h
@@ -49,25 +49,25 @@ class ProxyResolvingClientSocket : public net::StreamSocket {
 
   // net::StreamSocket 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;
-  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;
+                    const net::CompletionCallback& callback) override;
+  virtual int SetReceiveBufferSize(int32 size) override;
+  virtual int SetSendBufferSize(int32 size) 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:
   // Proxy resolution and connection functions.
diff --git a/jingle/glue/pseudotcp_adapter.cc b/jingle/glue/pseudotcp_adapter.cc
index cdb44a0..74f3f18 100644
--- a/jingle/glue/pseudotcp_adapter.cc
+++ b/jingle/glue/pseudotcp_adapter.cc
@@ -38,14 +38,14 @@ class PseudoTcpAdapter::Core : public cricket::IPseudoTcpNotify,
 
   // cricket::IPseudoTcpNotify interface.
   // These notifications are triggered from NotifyPacket.
-  virtual void OnTcpOpen(cricket::PseudoTcp* tcp) OVERRIDE;
-  virtual void OnTcpReadable(cricket::PseudoTcp* tcp) OVERRIDE;
-  virtual void OnTcpWriteable(cricket::PseudoTcp* tcp) OVERRIDE;
+  virtual void OnTcpOpen(cricket::PseudoTcp* tcp) override;
+  virtual void OnTcpReadable(cricket::PseudoTcp* tcp) override;
+  virtual void OnTcpWriteable(cricket::PseudoTcp* tcp) override;
   // This is triggered by NotifyClock or NotifyPacket.
-  virtual void OnTcpClosed(cricket::PseudoTcp* tcp, uint32 error) OVERRIDE;
+  virtual void OnTcpClosed(cricket::PseudoTcp* tcp, uint32 error) override;
   // This is triggered by NotifyClock, NotifyPacket, Recv and Send.
   virtual WriteResult TcpWritePacket(cricket::PseudoTcp* tcp,
-                                     const char* buffer, size_t len) OVERRIDE;
+                                     const char* buffer, size_t len) override;
 
   void SetAckDelay(int delay_ms);
   void SetNoDelay(bool no_delay);
diff --git a/jingle/glue/pseudotcp_adapter.h b/jingle/glue/pseudotcp_adapter.h
index e3e9419..88ebfc9 100644
--- a/jingle/glue/pseudotcp_adapter.h
+++ b/jingle/glue/pseudotcp_adapter.h
@@ -31,27 +31,27 @@ class PseudoTcpAdapter : public net::StreamSocket, base::NonThreadSafe {
 
   // net::Socket implementation.
   virtual int Read(net::IOBuffer* buffer, int buffer_size,
-                   const net::CompletionCallback& callback) OVERRIDE;
+                   const net::CompletionCallback& callback) override;
   virtual int Write(net::IOBuffer* buffer, int buffer_size,
-                    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 implementation.
-  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;
 
   // Set the delay for sending ACK.
   void SetAckDelay(int delay_ms);
diff --git a/jingle/glue/pseudotcp_adapter_unittest.cc b/jingle/glue/pseudotcp_adapter_unittest.cc
index e2329f8..00070ef 100644
--- a/jingle/glue/pseudotcp_adapter_unittest.cc
+++ b/jingle/glue/pseudotcp_adapter_unittest.cc
@@ -51,7 +51,7 @@ class LeakyBucket : public RateLimiter {
 
   virtual ~LeakyBucket() { }
 
-  virtual bool DropNextPacket() OVERRIDE {
+  virtual bool DropNextPacket() override {
     base::TimeTicks now = base::TimeTicks::HighResNow();
     double interval = (now - last_update_).InSecondsF();
     last_update_ = now;
@@ -108,7 +108,7 @@ class FakeSocket : public net::Socket {
 
   // net::Socket interface.
   virtual int Read(net::IOBuffer* buf, int buf_len,
-                   const net::CompletionCallback& callback) OVERRIDE {
+                   const net::CompletionCallback& callback) override {
     CHECK(read_callback_.is_null());
     CHECK(buf);
 
@@ -128,7 +128,7 @@ class FakeSocket : public net::Socket {
   }
 
   virtual int Write(net::IOBuffer* buf, int buf_len,
-                    const net::CompletionCallback& callback) OVERRIDE {
+                    const net::CompletionCallback& callback) override {
     DCHECK(buf);
     if (peer_socket_) {
       base::MessageLoop::current()->PostDelayedTask(
@@ -142,11 +142,11 @@ class FakeSocket : public net::Socket {
     return buf_len;
   }
 
-  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;
   }
@@ -298,7 +298,7 @@ class TCPChannelTester : public base::RefCountedThreadSafe<TCPChannelTester> {
 
 class PseudoTcpAdapterTest : public testing::Test {
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     JingleThreadWrapper::EnsureForCurrentMessageLoop();
 
     host_socket_ = new FakeSocket();
diff --git a/jingle/glue/task_pump.h b/jingle/glue/task_pump.h
index aae8f7db..0b86707 100644
--- a/jingle/glue/task_pump.h
+++ b/jingle/glue/task_pump.h
@@ -20,8 +20,8 @@ class TaskPump : public rtc::TaskRunner, public base::NonThreadSafe {
   virtual ~TaskPump();
 
   // rtc::TaskRunner implementation.
-  virtual void WakeTasks() OVERRIDE;
-  virtual int64 CurrentTime() OVERRIDE;
+  virtual void WakeTasks() override;
+  virtual int64 CurrentTime() override;
 
   // No tasks will be processed after this is called, even if
   // WakeTasks() is called.
diff --git a/jingle/glue/thread_wrapper.h b/jingle/glue/thread_wrapper.h
index e1365c9..0313bfb 100644
--- a/jingle/glue/thread_wrapper.h
+++ b/jingle/glue/thread_wrapper.h
@@ -52,47 +52,47 @@ class JingleThreadWrapper : public base::MessageLoop::DestructionObserver,
   void set_send_allowed(bool allowed) { send_allowed_ = allowed; }
 
   // MessageLoop::DestructionObserver implementation.
-  virtual void WillDestroyCurrentMessageLoop() OVERRIDE;
+  virtual void WillDestroyCurrentMessageLoop() override;
 
   // rtc::MessageQueue overrides.
   virtual void Post(rtc::MessageHandler *phandler,
                     uint32 id,
                     rtc::MessageData *pdata,
-                    bool time_sensitive) OVERRIDE;
+                    bool time_sensitive) override;
   virtual void PostDelayed(int delay_ms,
                            rtc::MessageHandler* handler,
                            uint32 id,
-                           rtc::MessageData* data) OVERRIDE;
+                           rtc::MessageData* data) override;
   virtual void Clear(rtc::MessageHandler* handler,
                      uint32 id,
-                     rtc::MessageList* removed) OVERRIDE;
+                     rtc::MessageList* removed) override;
   virtual void Send(rtc::MessageHandler *handler,
                     uint32 id,
-                    rtc::MessageData *data) OVERRIDE;
+                    rtc::MessageData *data) override;
 
   // Following methods are not supported.They are overriden just to
   // ensure that they are not called (each of them contain NOTREACHED
   // in the body). Some of this methods can be implemented if it
   // becomes neccessary to use libjingle code that calls them.
-  virtual void Quit() OVERRIDE;
-  virtual bool IsQuitting() OVERRIDE;
-  virtual void Restart() OVERRIDE;
+  virtual void Quit() override;
+  virtual bool IsQuitting() override;
+  virtual void Restart() override;
   virtual bool Get(rtc::Message* message,
                    int delay_ms,
-                   bool process_io) OVERRIDE;
+                   bool process_io) override;
   virtual bool Peek(rtc::Message* message,
-                    int delay_ms) OVERRIDE;
+                    int delay_ms) override;
   virtual void PostAt(uint32 timestamp,
                       rtc::MessageHandler* handler,
                       uint32 id,
-                      rtc::MessageData* data) OVERRIDE;
-  virtual void Dispatch(rtc::Message* message) OVERRIDE;
-  virtual void ReceiveSends() OVERRIDE;
-  virtual int GetDelay() OVERRIDE;
+                      rtc::MessageData* data) override;
+  virtual void Dispatch(rtc::Message* message) override;
+  virtual void ReceiveSends() override;
+  virtual int GetDelay() override;
 
   // rtc::Thread overrides.
-  virtual void Stop() OVERRIDE;
-  virtual void Run() OVERRIDE;
+  virtual void Stop() override;
+  virtual void Run() override;
 
  private:
   typedef std::map<int, rtc::Message> MessagesQueue;
diff --git a/jingle/glue/thread_wrapper_unittest.cc b/jingle/glue/thread_wrapper_unittest.cc
index 8eabe98..bca6c64 100644
--- a/jingle/glue/thread_wrapper_unittest.cc
+++ b/jingle/glue/thread_wrapper_unittest.cc
@@ -80,7 +80,7 @@ class ThreadWrapperTest : public testing::Test {
       : thread_(NULL) {
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     JingleThreadWrapper::EnsureForCurrentMessageLoop();
     thread_ = rtc::Thread::Current();
   }
diff --git a/jingle/glue/xmpp_client_socket_factory.h b/jingle/glue/xmpp_client_socket_factory.h
index 4204c19..03b2b14 100644
--- a/jingle/glue/xmpp_client_socket_factory.h
+++ b/jingle/glue/xmpp_client_socket_factory.h
@@ -36,11 +36,11 @@ class XmppClientSocketFactory : public ResolvingClientSocketFactory {
 
   // ResolvingClientSocketFactory implementation.
   virtual scoped_ptr<net::StreamSocket> CreateTransportClientSocket(
-      const net::HostPortPair& host_and_port) OVERRIDE;
+      const net::HostPortPair& host_and_port) override;
 
   virtual scoped_ptr<net::SSLClientSocket> CreateSSLClientSocket(
       scoped_ptr<net::ClientSocketHandle> transport_socket,
-      const net::HostPortPair& host_and_port) OVERRIDE;
+      const net::HostPortPair& host_and_port) override;
 
  private:
   net::ClientSocketFactory* const client_socket_factory_;
diff --git a/jingle/notifier/base/fake_base_task.cc b/jingle/notifier/base/fake_base_task.cc
index 3b51af4..510293c 100644
--- a/jingle/notifier/base/fake_base_task.cc
+++ b/jingle/notifier/base/fake_base_task.cc
@@ -41,7 +41,7 @@ class FakeWeakXmppClient : public notifier::WeakXmppClient {
 
   virtual ~FakeWeakXmppClient() {}
 
-  virtual const buzz::Jid& jid() const OVERRIDE {
+  virtual const buzz::Jid& jid() const override {
     return jid_;
   }
 
diff --git a/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc b/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc
index 4fc8e18..74ff87d 100644
--- a/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc
+++ b/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc
@@ -27,7 +27,7 @@ class GaiaCookieMechanism : public buzz::SaslCookieMechanism {
 
   virtual ~GaiaCookieMechanism() {}
 
-  virtual buzz::XmlElement* StartSaslAuth() OVERRIDE {
+  virtual buzz::XmlElement* StartSaslAuth() override {
     buzz::XmlElement* auth = buzz::SaslCookieMechanism::StartSaslAuth();
     // These attributes are necessary for working with non-gmail gaia
     // accounts.
diff --git a/jingle/notifier/base/gaia_token_pre_xmpp_auth.h b/jingle/notifier/base/gaia_token_pre_xmpp_auth.h
index 546288e..529b4e0 100644
--- a/jingle/notifier/base/gaia_token_pre_xmpp_auth.h
+++ b/jingle/notifier/base/gaia_token_pre_xmpp_auth.h
@@ -31,29 +31,29 @@ class GaiaTokenPreXmppAuth : public buzz::PreXmppAuth {
                                 const rtc::SocketAddress& server,
                                 const rtc::CryptString& pass,
                                 const std::string& auth_mechanism,
-                                const std::string& auth_token) OVERRIDE;
+                                const std::string& auth_token) override;
 
-  virtual bool IsAuthDone() const OVERRIDE;
+  virtual bool IsAuthDone() const override;
 
-  virtual bool IsAuthorized() const OVERRIDE;
+  virtual bool IsAuthorized() const override;
 
-  virtual bool HadError() const OVERRIDE;
+  virtual bool HadError() const override;
 
-  virtual int GetError() const OVERRIDE;
+  virtual int GetError() const override;
 
-  virtual buzz::CaptchaChallenge GetCaptchaChallenge() const OVERRIDE;
+  virtual buzz::CaptchaChallenge GetCaptchaChallenge() const override;
 
-  virtual std::string GetAuthToken() const OVERRIDE;
+  virtual std::string GetAuthToken() const override;
 
-  virtual std::string GetAuthMechanism() const OVERRIDE;
+  virtual std::string GetAuthMechanism() const override;
 
   // buzz::SaslHandler implementation.
 
   virtual std::string ChooseBestSaslMechanism(
-      const std::vector<std::string>& mechanisms, bool encrypted) OVERRIDE;
+      const std::vector<std::string>& mechanisms, bool encrypted) override;
 
   virtual buzz::SaslMechanism* CreateSaslMechanism(
-      const std::string& mechanism) OVERRIDE;
+      const std::string& mechanism) override;
 
  private:
   std::string username_;
diff --git a/jingle/notifier/base/weak_xmpp_client.h b/jingle/notifier/base/weak_xmpp_client.h
index 49e38dd..47c5587 100644
--- a/jingle/notifier/base/weak_xmpp_client.h
+++ b/jingle/notifier/base/weak_xmpp_client.h
@@ -40,7 +40,7 @@ class WeakXmppClient : public buzz::XmppClient, public base::NonThreadSafe {
   void Invalidate();
 
  protected:
-  virtual void Stop() OVERRIDE;
+  virtual void Stop() override;
 
  private:
   // We use our own WeakPtrFactory instead of inheriting from
diff --git a/jingle/notifier/communicator/login.h b/jingle/notifier/communicator/login.h
index 463eb1a..df02cc0 100644
--- a/jingle/notifier/communicator/login.h
+++ b/jingle/notifier/communicator/login.h
@@ -83,21 +83,21 @@ class Login : public net::NetworkChangeNotifier::IPAddressObserver,
   void UpdateXmppSettings(const buzz::XmppClientSettings& user_settings);
 
   // net::NetworkChangeNotifier::IPAddressObserver implementation.
-  virtual void OnIPAddressChanged() OVERRIDE;
+  virtual void OnIPAddressChanged() override;
 
   // net::NetworkChangeNotifier::ConnectionTypeObserver implementation.
   virtual void OnConnectionTypeChanged(
-      net::NetworkChangeNotifier::ConnectionType type) OVERRIDE;
+      net::NetworkChangeNotifier::ConnectionType type) override;
 
   // net::NetworkChangeNotifier::DNSObserver implementation.
-  virtual void OnDNSChanged() OVERRIDE;
+  virtual void OnDNSChanged() override;
 
   // SingleLoginAttempt::Delegate implementation.
   virtual void OnConnect(
-      base::WeakPtr<buzz::XmppTaskParentInterface> base_task) OVERRIDE;
-  virtual void OnRedirect(const ServerInformation& redirect_server) OVERRIDE;
-  virtual void OnCredentialsRejected() OVERRIDE;
-  virtual void OnSettingsExhausted() OVERRIDE;
+      base::WeakPtr<buzz::XmppTaskParentInterface> base_task) override;
+  virtual void OnRedirect(const ServerInformation& redirect_server) override;
+  virtual void OnCredentialsRejected() override;
+  virtual void OnSettingsExhausted() override;
 
  private:
   // Called by the various network notifications.
diff --git a/jingle/notifier/communicator/single_login_attempt.h b/jingle/notifier/communicator/single_login_attempt.h
index baf45e1..7c877cb 100644
--- a/jingle/notifier/communicator/single_login_attempt.h
+++ b/jingle/notifier/communicator/single_login_attempt.h
@@ -61,10 +61,10 @@ class SingleLoginAttempt : public XmppConnection::Delegate {
 
   // XmppConnection::Delegate implementation.
   virtual void OnConnect(
-      base::WeakPtr<buzz::XmppTaskParentInterface> parent) OVERRIDE;
+      base::WeakPtr<buzz::XmppTaskParentInterface> parent) override;
   virtual void OnError(buzz::XmppEngine::Error error,
                        int error_subcode,
-                       const buzz::XmlElement* stream_error) OVERRIDE;
+                       const buzz::XmlElement* stream_error) override;
 
  private:
   void TryConnect(const ConnectionSettings& new_settings);
diff --git a/jingle/notifier/communicator/single_login_attempt_unittest.cc b/jingle/notifier/communicator/single_login_attempt_unittest.cc
index 237e9f1..281ae0d 100644
--- a/jingle/notifier/communicator/single_login_attempt_unittest.cc
+++ b/jingle/notifier/communicator/single_login_attempt_unittest.cc
@@ -36,21 +36,21 @@ class FakeDelegate : public SingleLoginAttempt::Delegate {
   FakeDelegate() : state_(IDLE) {}
 
   virtual void OnConnect(
-      base::WeakPtr<buzz::XmppTaskParentInterface> base_task) OVERRIDE {
+      base::WeakPtr<buzz::XmppTaskParentInterface> base_task) override {
     state_ = CONNECTED;
     base_task_ = base_task;
   }
 
-  virtual void OnRedirect(const ServerInformation& redirect_server) OVERRIDE {
+  virtual void OnRedirect(const ServerInformation& redirect_server) override {
     state_ = REDIRECTED;
     redirect_server_ = redirect_server;
   }
 
-  virtual void OnCredentialsRejected() OVERRIDE {
+  virtual void OnCredentialsRejected() override {
     state_ = CREDENTIALS_REJECTED;
   }
 
-  virtual void OnSettingsExhausted() OVERRIDE {
+  virtual void OnSettingsExhausted() override {
     state_ = SETTINGS_EXHAUSTED;
   }
 
@@ -97,7 +97,7 @@ class SingleLoginAttemptTest : public ::testing::Test {
           "auth_mechanism"),
         attempt_(new SingleLoginAttempt(login_settings_, &fake_delegate_)) {}
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     message_loop_.RunUntilIdle();
   }
 
diff --git a/jingle/notifier/listener/fake_push_client.h b/jingle/notifier/listener/fake_push_client.h
index 2c1340d..c97d397 100644
--- a/jingle/notifier/listener/fake_push_client.h
+++ b/jingle/notifier/listener/fake_push_client.h
@@ -22,14 +22,14 @@ class FakePushClient : public PushClient {
   virtual ~FakePushClient();
 
   // PushClient implementation.
-  virtual void AddObserver(PushClientObserver* observer) OVERRIDE;
-  virtual void RemoveObserver(PushClientObserver* observer) OVERRIDE;
+  virtual void AddObserver(PushClientObserver* observer) override;
+  virtual void RemoveObserver(PushClientObserver* observer) override;
   virtual void UpdateSubscriptions(
-      const SubscriptionList& subscriptions) OVERRIDE;
+      const SubscriptionList& subscriptions) override;
   virtual void UpdateCredentials(
-      const std::string& email, const std::string& token) OVERRIDE;
-  virtual void SendNotification(const Notification& notification) OVERRIDE;
-  virtual void SendPing() OVERRIDE;
+      const std::string& email, const std::string& token) override;
+  virtual void SendNotification(const Notification& notification) override;
+  virtual void SendPing() override;
 
   // Triggers OnNotificationsEnabled on all observers.
   void EnableNotifications();
diff --git a/jingle/notifier/listener/fake_push_client_observer.h b/jingle/notifier/listener/fake_push_client_observer.h
index d350021..2460e37 100644
--- a/jingle/notifier/listener/fake_push_client_observer.h
+++ b/jingle/notifier/listener/fake_push_client_observer.h
@@ -17,11 +17,11 @@ class FakePushClientObserver : public PushClientObserver {
   virtual ~FakePushClientObserver();
 
   // PushClientObserver implementation.
-  virtual void OnNotificationsEnabled() OVERRIDE;
+  virtual void OnNotificationsEnabled() override;
   virtual void OnNotificationsDisabled(
-      NotificationsDisabledReason reason) OVERRIDE;
+      NotificationsDisabledReason reason) override;
   virtual void OnIncomingNotification(
-      const Notification& notification) OVERRIDE;
+      const Notification& notification) override;
 
   NotificationsDisabledReason last_notifications_disabled_reason() const;
   const Notification& last_incoming_notification() const;
diff --git a/jingle/notifier/listener/non_blocking_push_client.cc b/jingle/notifier/listener/non_blocking_push_client.cc
index ba89a2c3..e2a10b7 100644
--- a/jingle/notifier/listener/non_blocking_push_client.cc
+++ b/jingle/notifier/listener/non_blocking_push_client.cc
@@ -40,12 +40,12 @@ class NonBlockingPushClient::Core
   void SendNotification(const Notification& data);
   void SendPing();
 
-  virtual void OnNotificationsEnabled() OVERRIDE;
+  virtual void OnNotificationsEnabled() override;
   virtual void OnNotificationsDisabled(
-      NotificationsDisabledReason reason) OVERRIDE;
+      NotificationsDisabledReason reason) override;
   virtual void OnIncomingNotification(
-      const Notification& notification) OVERRIDE;
-  virtual void OnPingResponse() OVERRIDE;
+      const Notification& notification) override;
+  virtual void OnPingResponse() override;
 
  private:
   friend class base::RefCountedThreadSafe<NonBlockingPushClient::Core>;
diff --git a/jingle/notifier/listener/non_blocking_push_client.h b/jingle/notifier/listener/non_blocking_push_client.h
index b49ae03..17dba05 100644
--- a/jingle/notifier/listener/non_blocking_push_client.h
+++ b/jingle/notifier/listener/non_blocking_push_client.h
@@ -42,14 +42,14 @@ class NonBlockingPushClient : public PushClient {
   virtual ~NonBlockingPushClient();
 
   // PushClient implementation.
-  virtual void AddObserver(PushClientObserver* observer) OVERRIDE;
-  virtual void RemoveObserver(PushClientObserver* observer) OVERRIDE;
+  virtual void AddObserver(PushClientObserver* observer) override;
+  virtual void RemoveObserver(PushClientObserver* observer) override;
   virtual void UpdateSubscriptions(
-      const SubscriptionList& subscriptions) OVERRIDE;
+      const SubscriptionList& subscriptions) override;
   virtual void UpdateCredentials(
-      const std::string& email, const std::string& token) OVERRIDE;
-  virtual void SendNotification(const Notification& notification) OVERRIDE;
-  virtual void SendPing() OVERRIDE;
+      const std::string& email, const std::string& token) override;
+  virtual void SendNotification(const Notification& notification) override;
+  virtual void SendPing() override;
 
  private:
   class Core;
diff --git a/jingle/notifier/listener/non_blocking_push_client_unittest.cc b/jingle/notifier/listener/non_blocking_push_client_unittest.cc
index a26bba1..0066aa9 100644
--- a/jingle/notifier/listener/non_blocking_push_client_unittest.cc
+++ b/jingle/notifier/listener/non_blocking_push_client_unittest.cc
@@ -26,7 +26,7 @@ class NonBlockingPushClientTest : public testing::Test {
 
   virtual ~NonBlockingPushClientTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     push_client_.reset(
         new NonBlockingPushClient(
             base::MessageLoopProxy::current(),
@@ -37,7 +37,7 @@ class NonBlockingPushClientTest : public testing::Test {
     message_loop_.RunUntilIdle();
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     // Clear out any pending notifications before removing observers.
     message_loop_.RunUntilIdle();
     push_client_->RemoveObserver(&fake_observer_);
diff --git a/jingle/notifier/listener/push_notifications_listen_task.h b/jingle/notifier/listener/push_notifications_listen_task.h
index 62d408b..659a946 100644
--- a/jingle/notifier/listener/push_notifications_listen_task.h
+++ b/jingle/notifier/listener/push_notifications_listen_task.h
@@ -39,9 +39,9 @@ class PushNotificationsListenTask : public buzz::XmppTask {
   virtual ~PushNotificationsListenTask();
 
   // Overriden from buzz::XmppTask.
-  virtual int ProcessStart() OVERRIDE;
-  virtual int ProcessResponse() OVERRIDE;
-  virtual bool HandleStanza(const buzz::XmlElement* stanza) OVERRIDE;
+  virtual int ProcessStart() override;
+  virtual int ProcessResponse() override;
+  virtual bool HandleStanza(const buzz::XmlElement* stanza) override;
 
  private:
   bool IsValidNotification(const buzz::XmlElement* stanza);
diff --git a/jingle/notifier/listener/push_notifications_send_update_task.h b/jingle/notifier/listener/push_notifications_send_update_task.h
index 36bb3c3..287705b5 100644
--- a/jingle/notifier/listener/push_notifications_send_update_task.h
+++ b/jingle/notifier/listener/push_notifications_send_update_task.h
@@ -27,7 +27,7 @@ class PushNotificationsSendUpdateTask : public buzz::XmppTask {
   virtual ~PushNotificationsSendUpdateTask();
 
   // Overridden from buzz::XmppTask.
-  virtual int ProcessStart() OVERRIDE;
+  virtual int ProcessStart() override;
 
  private:
   // Allocates and constructs an buzz::XmlElement containing the update stanza.
diff --git a/jingle/notifier/listener/push_notifications_subscribe_task.h b/jingle/notifier/listener/push_notifications_subscribe_task.h
index ac2a6ed..7580124 100644
--- a/jingle/notifier/listener/push_notifications_subscribe_task.h
+++ b/jingle/notifier/listener/push_notifications_subscribe_task.h
@@ -32,9 +32,9 @@ class PushNotificationsSubscribeTask : public buzz::XmppTask {
   virtual ~PushNotificationsSubscribeTask();
 
   // Overridden from XmppTask.
-  virtual int ProcessStart() OVERRIDE;
-  virtual int ProcessResponse() OVERRIDE;
-  virtual bool HandleStanza(const buzz::XmlElement* stanza) OVERRIDE;
+  virtual int ProcessStart() override;
+  virtual int ProcessResponse() override;
+  virtual bool HandleStanza(const buzz::XmlElement* stanza) override;
 
  private:
   // Assembles an Xmpp stanza which can be sent to subscribe to notifications.
diff --git a/jingle/notifier/listener/send_ping_task.h b/jingle/notifier/listener/send_ping_task.h
index 9cd8b22..ac4fa20 100644
--- a/jingle/notifier/listener/send_ping_task.h
+++ b/jingle/notifier/listener/send_ping_task.h
@@ -32,9 +32,9 @@ class SendPingTask : public buzz::XmppTask {
   virtual ~SendPingTask();
 
   // Overridden from buzz::XmppTask.
-  virtual int ProcessStart() OVERRIDE;
-  virtual int ProcessResponse() OVERRIDE;
-  virtual bool HandleStanza(const buzz::XmlElement* stanza) OVERRIDE;
+  virtual int ProcessStart() override;
+  virtual int ProcessResponse() override;
+  virtual bool HandleStanza(const buzz::XmlElement* stanza) override;
 
  private:
   static buzz::XmlElement* MakePingStanza(const std::string& task_id);
diff --git a/jingle/notifier/listener/xmpp_push_client.h b/jingle/notifier/listener/xmpp_push_client.h
index 08a1811..4c6fea5 100644
--- a/jingle/notifier/listener/xmpp_push_client.h
+++ b/jingle/notifier/listener/xmpp_push_client.h
@@ -44,31 +44,31 @@ class XmppPushClient :
   virtual ~XmppPushClient();
 
   // PushClient implementation.
-  virtual void AddObserver(PushClientObserver* observer) OVERRIDE;
-  virtual void RemoveObserver(PushClientObserver* observer) OVERRIDE;
+  virtual void AddObserver(PushClientObserver* observer) override;
+  virtual void RemoveObserver(PushClientObserver* observer) override;
   virtual void UpdateSubscriptions(
-      const SubscriptionList& subscriptions) OVERRIDE;
+      const SubscriptionList& subscriptions) override;
   virtual void UpdateCredentials(
-      const std::string& email, const std::string& token) OVERRIDE;
-  virtual void SendNotification(const Notification& notification) OVERRIDE;
-  virtual void SendPing() OVERRIDE;
+      const std::string& email, const std::string& token) override;
+  virtual void SendNotification(const Notification& notification) override;
+  virtual void SendPing() override;
 
   // Login::Delegate implementation.
   virtual void OnConnect(
-      base::WeakPtr<buzz::XmppTaskParentInterface> base_task) OVERRIDE;
-  virtual void OnTransientDisconnection() OVERRIDE;
-  virtual void OnCredentialsRejected() OVERRIDE;
+      base::WeakPtr<buzz::XmppTaskParentInterface> base_task) override;
+  virtual void OnTransientDisconnection() override;
+  virtual void OnCredentialsRejected() override;
 
   // PushNotificationsListenTaskDelegate implementation.
   virtual void OnNotificationReceived(
-      const Notification& notification) OVERRIDE;
+      const Notification& notification) override;
 
   // PushNotificationsSubscribeTaskDelegate implementation.
-  virtual void OnSubscribed() OVERRIDE;
-  virtual void OnSubscriptionError() OVERRIDE;
+  virtual void OnSubscribed() override;
+  virtual void OnSubscriptionError() override;
 
   // SendPingTaskDelegate implementation.
-  virtual void OnPingResponseReceived() OVERRIDE;
+  virtual void OnPingResponseReceived() override;
 
  private:
   base::ThreadChecker thread_checker_;
diff --git a/jingle/notifier/listener/xmpp_push_client_unittest.cc b/jingle/notifier/listener/xmpp_push_client_unittest.cc
index 7d5d820..bd0b46d 100644
--- a/jingle/notifier/listener/xmpp_push_client_unittest.cc
+++ b/jingle/notifier/listener/xmpp_push_client_unittest.cc
@@ -40,12 +40,12 @@ class XmppPushClientTest : public testing::Test {
 
   virtual ~XmppPushClientTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     xmpp_push_client_.reset(new XmppPushClient(notifier_options_));
     xmpp_push_client_->AddObserver(&mock_observer_);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     // Clear out any messages posted by XmppPushClient.
     message_loop_.RunUntilIdle();
     xmpp_push_client_->RemoveObserver(&mock_observer_);