net/socket/ssl_client_socket_nss.h - Issue 848006: Generalize the net module's LoadLog facility from a passive container, to an event stream (NetLog).

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/ssl_client_socket_nss.h

Issue 848006: Generalize the net module's LoadLog facility from a passive container, to an event stream (NetLog). (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Split up RequestTracker into ConnectJobTracker+RequestTracker+RequestTrackerBase, address comments Created 10 years, 9 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

Index: net/socket/ssl_client_socket_nss.h

===================================================================

--- net/socket/ssl_client_socket_nss.h (revision 41560)

+++ net/socket/ssl_client_socket_nss.h (working copy)

@@ -16,14 +16,15 @@

#include "base/scoped_ptr.h"

#include "net/base/cert_verify_result.h"

#include "net/base/completion_callback.h"

+#include "net/base/net_log.h"

#include "net/base/nss_memio.h"

#include "net/base/ssl_config_service.h"

#include "net/socket/ssl_client_socket.h"

namespace net {

+class BoundNetLog;

class CertVerifier;

-class LoadLog;

class X509Certificate;

// An SSL client socket implemented with Mozilla NSS.

@@ -44,7 +45,7 @@

virtual NextProtoStatus GetNextProto(std::string* proto);

// ClientSocket methods:

- virtual int Connect(CompletionCallback* callback, LoadLog* load_log);

+ virtual int Connect(CompletionCallback* callback, const BoundNetLog& net_log);

virtual void Disconnect();

virtual bool IsConnected() const;

virtual bool IsConnectedAndIdle() const;

@@ -154,7 +155,7 @@

// Buffers for the network end of the SSL state machine

memio_Private* nss_bufs_;

- scoped_refptr<LoadLog> load_log_;

+ BoundNetLog net_log_;

#if defined(OS_WIN)

// A CryptoAPI in-memory certificate store. We use it for two purposes:

« no previous file with comments | « net/socket/ssl_client_socket_mac.cc ('k') | net/socket/ssl_client_socket_nss.cc » ('j') | no next file with comments »