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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/socket/ssl_client_socket_unittest.cc

Issue 623213004: replace OVERRIDE and FINAL with override and final in net/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: undo unwanted change in comment 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 | « net/socket/ssl_client_socket_pool.h ('k') | net/socket/ssl_server_socket_nss.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_unittest.cc
diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc
index 4e844cd9daa5d4f00c2fe78b1cf881d59ecd93ec..40a4d3cd37543883f699e87880c66375d0f61622 100644
--- a/net/socket/ssl_client_socket_unittest.cc
+++ b/net/socket/ssl_client_socket_unittest.cc
@@ -60,62 +60,62 @@ class WrappedStreamSocket : public StreamSocket {
virtual ~WrappedStreamSocket() {}
// StreamSocket implementation:
- virtual int Connect(const CompletionCallback& callback) OVERRIDE {
+ virtual int Connect(const CompletionCallback& callback) override {
return transport_->Connect(callback);
}
- virtual void Disconnect() OVERRIDE { transport_->Disconnect(); }
- virtual bool IsConnected() const OVERRIDE {
+ virtual void Disconnect() override { transport_->Disconnect(); }
+ virtual bool IsConnected() const override {
return transport_->IsConnected();
}
- virtual bool IsConnectedAndIdle() const OVERRIDE {
+ virtual bool IsConnectedAndIdle() const override {
return transport_->IsConnectedAndIdle();
}
- virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE {
+ virtual int GetPeerAddress(IPEndPoint* address) const override {
return transport_->GetPeerAddress(address);
}
- virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE {
+ virtual int GetLocalAddress(IPEndPoint* address) const override {
return transport_->GetLocalAddress(address);
}
- virtual const BoundNetLog& NetLog() const OVERRIDE {
+ virtual const BoundNetLog& NetLog() const override {
return transport_->NetLog();
}
- virtual void SetSubresourceSpeculation() OVERRIDE {
+ virtual void SetSubresourceSpeculation() override {
transport_->SetSubresourceSpeculation();
}
- virtual void SetOmniboxSpeculation() OVERRIDE {
+ virtual void SetOmniboxSpeculation() override {
transport_->SetOmniboxSpeculation();
}
- virtual bool WasEverUsed() const OVERRIDE {
+ virtual bool WasEverUsed() const override {
return transport_->WasEverUsed();
}
- virtual bool UsingTCPFastOpen() const OVERRIDE {
+ virtual bool UsingTCPFastOpen() const override {
return transport_->UsingTCPFastOpen();
}
- virtual bool WasNpnNegotiated() const OVERRIDE {
+ virtual bool WasNpnNegotiated() const override {
return transport_->WasNpnNegotiated();
}
- virtual NextProto GetNegotiatedProtocol() const OVERRIDE {
+ virtual NextProto GetNegotiatedProtocol() const override {
return transport_->GetNegotiatedProtocol();
}
- virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE {
+ virtual bool GetSSLInfo(SSLInfo* ssl_info) override {
return transport_->GetSSLInfo(ssl_info);
}
// Socket implementation:
virtual int Read(IOBuffer* buf,
int buf_len,
- const CompletionCallback& callback) OVERRIDE {
+ const CompletionCallback& callback) override {
return transport_->Read(buf, buf_len, callback);
}
virtual int Write(IOBuffer* buf,
int buf_len,
- const CompletionCallback& callback) OVERRIDE {
+ const CompletionCallback& callback) override {
return transport_->Write(buf, buf_len, callback);
}
- virtual int SetReceiveBufferSize(int32 size) OVERRIDE {
+ virtual int SetReceiveBufferSize(int32 size) override {
return transport_->SetReceiveBufferSize(size);
}
- virtual int SetSendBufferSize(int32 size) OVERRIDE {
+ virtual int SetSendBufferSize(int32 size) override {
return transport_->SetSendBufferSize(size);
}
@@ -137,7 +137,7 @@ class ReadBufferingStreamSocket : public WrappedStreamSocket {
// Socket implementation:
virtual int Read(IOBuffer* buf,
int buf_len,
- const CompletionCallback& callback) OVERRIDE;
+ const CompletionCallback& callback) override;
// Sets the internal buffer to |size|. This must not be greater than
// the largest value supplied to Read() - that is, it does not handle
@@ -267,10 +267,10 @@ class SynchronousErrorStreamSocket : public WrappedStreamSocket {
// Socket implementation:
virtual int Read(IOBuffer* buf,
int buf_len,
- const CompletionCallback& callback) OVERRIDE;
+ const CompletionCallback& callback) override;
virtual int Write(IOBuffer* buf,
int buf_len,
- const CompletionCallback& callback) OVERRIDE;
+ const CompletionCallback& callback) override;
// Sets the next Read() call and all future calls to return |error|.
// If there is already a pending asynchronous read, the configured error
@@ -338,10 +338,10 @@ class FakeBlockingStreamSocket : public WrappedStreamSocket {
// Socket implementation:
virtual int Read(IOBuffer* buf,
int buf_len,
- const CompletionCallback& callback) OVERRIDE;
+ const CompletionCallback& callback) override;
virtual int Write(IOBuffer* buf,
int buf_len,
- const CompletionCallback& callback) OVERRIDE;
+ const CompletionCallback& callback) override;
// Blocks read results on the socket. Reads will not complete until
// UnblockReadResult() has been called and a result is ready from the
@@ -554,13 +554,13 @@ class CountingStreamSocket : public WrappedStreamSocket {
// Socket implementation:
virtual int Read(IOBuffer* buf,
int buf_len,
- const CompletionCallback& callback) OVERRIDE {
+ const CompletionCallback& callback) override {
read_count_++;
return transport_->Read(buf, buf_len, callback);
}
virtual int Write(IOBuffer* buf,
int buf_len,
- const CompletionCallback& callback) OVERRIDE {
+ const CompletionCallback& callback) override {
write_count_++;
return transport_->Write(buf, buf_len, callback);
}
@@ -609,26 +609,26 @@ class FailingChannelIDStore : public ChannelIDStore {
base::Time* expiration_time,
std::string* private_key_result,
std::string* cert_result,
- const GetChannelIDCallback& callback) OVERRIDE {
+ const GetChannelIDCallback& callback) override {
return ERR_UNEXPECTED;
}
virtual void SetChannelID(const std::string& server_identifier,
base::Time creation_time,
base::Time expiration_time,
const std::string& private_key,
- const std::string& cert) OVERRIDE {}
+ const std::string& cert) override {}
virtual void DeleteChannelID(const std::string& server_identifier,
const base::Closure& completion_callback)
- OVERRIDE {}
+ override {}
virtual void DeleteAllCreatedBetween(base::Time delete_begin,
base::Time delete_end,
const base::Closure& completion_callback)
- OVERRIDE {}
- virtual void DeleteAll(const base::Closure& completion_callback) OVERRIDE {}
+ override {}
+ virtual void DeleteAll(const base::Closure& completion_callback) override {}
virtual void GetAllChannelIDs(const GetChannelIDListCallback& callback)
- OVERRIDE {}
- virtual int GetChannelIDCount() OVERRIDE { return 0; }
- virtual void SetForceKeepSessionState() OVERRIDE {}
+ override {}
+ virtual int GetChannelIDCount() override { return 0; }
+ virtual void SetForceKeepSessionState() override {}
};
// A ChannelIDStore that asynchronously returns an error when asked for a
@@ -638,7 +638,7 @@ class AsyncFailingChannelIDStore : public ChannelIDStore {
base::Time* expiration_time,
std::string* private_key_result,
std::string* cert_result,
- const GetChannelIDCallback& callback) OVERRIDE {
+ const GetChannelIDCallback& callback) override {
base::MessageLoop::current()->PostTask(
FROM_HERE, base::Bind(callback, ERR_UNEXPECTED,
server_identifier, base::Time(), "", ""));
@@ -648,19 +648,19 @@ class AsyncFailingChannelIDStore : public ChannelIDStore {
base::Time creation_time,
base::Time expiration_time,
const std::string& private_key,
- const std::string& cert) OVERRIDE {}
+ const std::string& cert) override {}
virtual void DeleteChannelID(const std::string& server_identifier,
const base::Closure& completion_callback)
- OVERRIDE {}
+ override {}
virtual void DeleteAllCreatedBetween(base::Time delete_begin,
base::Time delete_end,
const base::Closure& completion_callback)
- OVERRIDE {}
- virtual void DeleteAll(const base::Closure& completion_callback) OVERRIDE {}
+ override {}
+ virtual void DeleteAll(const base::Closure& completion_callback) override {}
virtual void GetAllChannelIDs(const GetChannelIDListCallback& callback)
- OVERRIDE {}
- virtual int GetChannelIDCount() OVERRIDE { return 0; }
- virtual void SetForceKeepSessionState() OVERRIDE {}
+ override {}
+ virtual int GetChannelIDCount() override { return 0; }
+ virtual void SetForceKeepSessionState() override {}
};
// A mock CTVerifier that records every call to Verify but doesn't verify
« no previous file with comments | « net/socket/ssl_client_socket_pool.h ('k') | net/socket/ssl_server_socket_nss.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698