diff options
Diffstat (limited to 'jingle')
4 files changed, 8 insertions, 8 deletions
diff --git a/jingle/glue/chrome_async_socket_unittest.cc b/jingle/glue/chrome_async_socket_unittest.cc index 18b0d27..1681dbd 100644 --- a/jingle/glue/chrome_async_socket_unittest.cc +++ b/jingle/glue/chrome_async_socket_unittest.cc @@ -41,7 +41,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() { + virtual net::MockRead GetNextRead() OVERRIDE { if (reads_.empty()) { DCHECK(!has_pending_read_); has_pending_read_ = true; @@ -55,7 +55,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) { + virtual net::MockWriteResult OnWrite(const std::string& data) OVERRIDE { DCHECK(!writes_.empty()); net::MockWrite mock_write = writes_.front(); writes_.pop_front(); @@ -72,7 +72,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() {} + virtual void Reset() OVERRIDE {} // If there is a pending read, completes it with the given read. // Otherwise, queues up the given read. @@ -112,14 +112,14 @@ class MockXmppClientSocketFactory : public ResolvingClientSocketFactory { // ResolvingClientSocketFactory implementation. virtual net::StreamSocket* CreateTransportClientSocket( - const net::HostPortPair& host_and_port) { + const net::HostPortPair& host_and_port) OVERRIDE { return mock_client_socket_factory_->CreateTransportClientSocket( address_list_, NULL, net::NetLog::Source()); } virtual net::SSLClientSocket* CreateSSLClientSocket( net::ClientSocketHandle* transport_socket, - const net::HostPortPair& host_and_port) { + const net::HostPortPair& host_and_port) OVERRIDE { net::SSLClientSocketContext context; context.cert_verifier = cert_verifier_.get(); return mock_client_socket_factory_->CreateSSLClientSocket( diff --git a/jingle/glue/pseudotcp_adapter_unittest.cc b/jingle/glue/pseudotcp_adapter_unittest.cc index c1302ce..6cdb554 100644 --- a/jingle/glue/pseudotcp_adapter_unittest.cc +++ b/jingle/glue/pseudotcp_adapter_unittest.cc @@ -113,7 +113,7 @@ class FakeSocket : public net::Socket { // net::Socket interface. virtual int Read(net::IOBuffer* buf, int buf_len, - const net::CompletionCallback& callback) { + const net::CompletionCallback& callback) OVERRIDE { CHECK(read_callback_.is_null()); CHECK(buf); diff --git a/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc b/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc index 311371a..24aa6a9 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() { + 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/communicator/single_login_attempt_unittest.cc b/jingle/notifier/communicator/single_login_attempt_unittest.cc index d32fad5..20a9bf7 100644 --- a/jingle/notifier/communicator/single_login_attempt_unittest.cc +++ b/jingle/notifier/communicator/single_login_attempt_unittest.cc @@ -35,7 +35,7 @@ class FakeDelegate : public SingleLoginAttempt::Delegate { public: FakeDelegate() : state_(IDLE) {} - void OnConnect( + virtual void OnConnect( base::WeakPtr<buzz::XmppTaskParentInterface> base_task) OVERRIDE { state_ = CONNECTED; base_task_ = base_task; |