Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1627)

Unified Diff: jingle/glue/chrome_async_socket_unittest.cc

Issue 628123002: Replacing the OVERRIDE with override and FINAL with final in jingle (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « jingle/glue/chrome_async_socket.h ('k') | jingle/glue/fake_ssl_client_socket.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: jingle/glue/chrome_async_socket_unittest.cc
diff --git a/jingle/glue/chrome_async_socket_unittest.cc b/jingle/glue/chrome_async_socket_unittest.cc
index a26c136d951d697766149113e73b88605c6f7d05..e04b6080d5aea4fe2a9ec7cadd4096d60d2c66e3 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();
« no previous file with comments | « jingle/glue/chrome_async_socket.h ('k') | jingle/glue/fake_ssl_client_socket.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698