Index: remoting/protocol/fake_stream_socket.h |
diff --git a/remoting/protocol/fake_stream_socket.h b/remoting/protocol/fake_stream_socket.h |
index 1ba667ad7c5cac54b428d5fde320714bb60fa36f..cb17e8924938a653edb0c0859bb333c38e57d6a7 100644 |
--- a/remoting/protocol/fake_stream_socket.h |
+++ b/remoting/protocol/fake_stream_socket.h |
@@ -34,7 +34,7 @@ namespace protocol { |
class FakeStreamSocket : public net::StreamSocket { |
public: |
FakeStreamSocket(); |
- virtual ~FakeStreamSocket(); |
+ ~FakeStreamSocket() override; |
// Returns all data written to the socket. |
const std::string& written_data() const { return written_data_; } |
@@ -66,28 +66,30 @@ class FakeStreamSocket : public net::StreamSocket { |
base::WeakPtr<FakeStreamSocket> GetWeakPtr(); |
// net::Socket implementation. |
- virtual int Read(net::IOBuffer* buf, int buf_len, |
- 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; |
+ int Read(net::IOBuffer* buf, |
+ int buf_len, |
+ const net::CompletionCallback& callback) override; |
+ int Write(net::IOBuffer* buf, |
+ int buf_len, |
+ const net::CompletionCallback& callback) override; |
+ int SetReceiveBufferSize(int32 size) override; |
+ 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; |
+ int Connect(const net::CompletionCallback& callback) override; |
+ void Disconnect() override; |
+ bool IsConnected() const override; |
+ bool IsConnectedAndIdle() const override; |
+ int GetPeerAddress(net::IPEndPoint* address) const override; |
+ int GetLocalAddress(net::IPEndPoint* address) const override; |
+ const net::BoundNetLog& NetLog() const override; |
+ void SetSubresourceSpeculation() override; |
+ void SetOmniboxSpeculation() override; |
+ bool WasEverUsed() const override; |
+ bool UsingTCPFastOpen() const override; |
+ bool WasNpnNegotiated() const override; |
+ net::NextProto GetNegotiatedProtocol() const override; |
+ bool GetSSLInfo(net::SSLInfo* ssl_info) override; |
private: |
void DoAsyncWrite(scoped_refptr<net::IOBuffer> buf, int buf_len, |
@@ -121,7 +123,7 @@ class FakeStreamSocket : public net::StreamSocket { |
class FakeStreamChannelFactory : public StreamChannelFactory { |
public: |
FakeStreamChannelFactory(); |
- virtual ~FakeStreamChannelFactory(); |
+ ~FakeStreamChannelFactory() override; |
void set_asynchronous_create(bool asynchronous_create) { |
asynchronous_create_ = asynchronous_create; |
@@ -132,9 +134,9 @@ class FakeStreamChannelFactory : public StreamChannelFactory { |
FakeStreamSocket* GetFakeChannel(const std::string& name); |
// ChannelFactory interface. |
- virtual void CreateChannel(const std::string& name, |
- const ChannelCreatedCallback& callback) override; |
- virtual void CancelChannelCreation(const std::string& name) override; |
+ void CreateChannel(const std::string& name, |
+ const ChannelCreatedCallback& callback) override; |
+ void CancelChannelCreation(const std::string& name) override; |
private: |
void NotifyChannelCreated(scoped_ptr<FakeStreamSocket> owned_channel, |