From 9e743cddfd631038fe6f1cdde050e18d61319ec6 Mon Sep 17 00:00:00 2001 From: "eroman@chromium.org" Date: Tue, 16 Mar 2010 07:03:53 +0000 Subject: Generalize the net module's LoadLog facility from a passive container, to an event stream (NetLog). This makes it possible to associate a single NetLog with a URLRequestContext, and then attach observers to that log to watch the stream of events. This changelist attempts to do the most direct translation, so there will be subsequent iterations to clean up. The user-visible behavior should remain unchanged. BUG=37421 Review URL: http://codereview.chromium.org/848006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41689 0039d316-1c4b-4281-b951-d872f2087c98 --- net/socket/ssl_client_socket_mac.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'net/socket/ssl_client_socket_mac.h') diff --git a/net/socket/ssl_client_socket_mac.h b/net/socket/ssl_client_socket_mac.h index 3e6f97e..3e649ff 100644 --- a/net/socket/ssl_client_socket_mac.h +++ b/net/socket/ssl_client_socket_mac.h @@ -13,13 +13,13 @@ #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/ssl_config_service.h" #include "net/socket/ssl_client_socket.h" namespace net { class CertVerifier; -class LoadLog; // An SSL client socket implemented with Secure Transport. class SSLClientSocketMac : public SSLClientSocket { @@ -39,7 +39,7 @@ class SSLClientSocketMac : public SSLClientSocket { 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; @@ -127,7 +127,7 @@ class SSLClientSocketMac : public SSLClientSocket { scoped_refptr read_io_buf_; scoped_refptr write_io_buf_; - scoped_refptr load_log_; + BoundNetLog net_log_; }; } // namespace net -- cgit v1.1