| Index: net/socket/socket_test_util.h
|
| diff --git a/net/socket/socket_test_util.h b/net/socket/socket_test_util.h
|
| index dbac707cb75edc48c67d495db0af89c8874870fa..350e0b4439e2dc2c6c4e7d2689d6de2434b0db40 100644
|
| --- a/net/socket/socket_test_util.h
|
| +++ b/net/socket/socket_test_util.h
|
| @@ -750,9 +750,9 @@ class MockSSLClientSocket : public MockClientSocket, public AsyncSocket {
|
| std::string* server_protos) OVERRIDE;
|
| virtual bool was_npn_negotiated() const OVERRIDE;
|
| virtual bool set_was_npn_negotiated(bool negotiated) OVERRIDE;
|
| - virtual NextProto protocol_negotiated() const OVERRIDE;
|
| virtual void set_protocol_negotiated(
|
| NextProto protocol_negotiated) OVERRIDE;
|
| + virtual NextProto GetNegotiatedProtocol() const OVERRIDE;
|
|
|
| // This MockSocket does not implement the manual async IO feature.
|
| virtual void OnReadComplete(const MockRead& data) OVERRIDE;
|
|
|