net/socket/socket_test_util.h - Issue 10690122: Change SpdySession::GetSSLInfo to get the SSLInfo from the underlying socket

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/socket/socket_test_util.h

Issue 10690122: Change SpdySession::GetSSLInfo to get the SSLInfo from the underlying socket (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Expand comment on unit test. Created 8 years, 5 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

« net/http/http_network_transaction_spdy2_unittest.cc ('K') | « net/socket/client_socket_pool_base_unittest.cc ('k') | net/socket/socket_test_util.cc » ('j') | net/socket/ssl_client_socket.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/socket/socket_test_util.h

diff --git a/net/socket/socket_test_util.h b/net/socket/socket_test_util.h

index 2638afe936517faffd5d102150a2e78e136506b0..62c05602c1465063de155748b3c6014244d7e62d 100644

--- a/net/socket/socket_test_util.h

+++ b/net/socket/socket_test_util.h

@@ -596,7 +596,6 @@ class MockClientSocket : public SSLClientSocket {

virtual void SetOmniboxSpeculation() OVERRIDE {}

// SSLClientSocket implementation.

- virtual void GetSSLInfo(SSLInfo* ssl_info) OVERRIDE;

virtual void GetSSLCertRequestInfo(

SSLCertRequestInfo* cert_request_info) OVERRIDE;

virtual int ExportKeyingMaterial(const base::StringPiece& label,

@@ -648,6 +647,8 @@ class MockTCPClientSocket : public MockClientSocket, public AsyncSocket {

virtual bool UsingTCPFastOpen() const OVERRIDE;

virtual int64 NumBytesRead() const OVERRIDE;

virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE;

+ virtual bool WasNpnNegotiated() const OVERRIDE;

+ virtual bool GetSSLInfo(SSLInfo* ssl_info) const OVERRIDE;

// AsyncSocket:

virtual void OnReadComplete(const MockRead& data) OVERRIDE;

@@ -705,6 +706,8 @@ class DeterministicMockTCPClientSocket : public MockClientSocket,

virtual bool UsingTCPFastOpen() const OVERRIDE;

virtual int64 NumBytesRead() const OVERRIDE;

virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE;

+ virtual bool WasNpnNegotiated() const OVERRIDE;

+ virtual bool GetSSLInfo(SSLInfo* ssl_info) const OVERRIDE;

// AsyncSocket:

virtual void OnReadComplete(const MockRead& data) OVERRIDE;

@@ -748,14 +751,15 @@ class MockSSLClientSocket : public MockClientSocket, public AsyncSocket {

virtual int64 NumBytesRead() const OVERRIDE;

virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE;

virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE;

+ virtual bool WasNpnNegotiated() const OVERRIDE;

+ virtual bool GetSSLInfo(SSLInfo* ssl_info) const OVERRIDE;

// SSLClientSocket implementation.

- virtual void GetSSLInfo(SSLInfo* ssl_info) OVERRIDE;

virtual void GetSSLCertRequestInfo(

SSLCertRequestInfo* cert_request_info) OVERRIDE;

virtual NextProtoStatus GetNextProto(std::string* proto,

std::string* server_protos) OVERRIDE;

- virtual bool was_npn_negotiated() const OVERRIDE;

+ //virtual bool was_npn_negotiated() const OVERRIDE;

virtual bool set_was_npn_negotiated(bool negotiated) OVERRIDE;

virtual void set_protocol_negotiated(

NextProto protocol_negotiated) OVERRIDE;