diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-28 19:28:09 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-28 19:28:09 +0000 |
| commit | ec11be60eaf6e832219328ea18656c558dec3040 (patch) | |
| tree | 1d8a6710f277a55b4743fbc54c8554abf3164669 /net/socket/ssl_client_socket_nss.cc | |
| parent | 9bb75ccc56cdb94a9778dcef26be3de97808f3ce (diff) | |
| download | chromium_src-ec11be60eaf6e832219328ea18656c558dec3040.zip chromium_src-ec11be60eaf6e832219328ea18656c558dec3040.tar.gz chromium_src-ec11be60eaf6e832219328ea18656c558dec3040.tar.bz2 | |
More cleanup to address TODOs in net_log.h.
* Removes 9 methods: AddEventWithParameters, BeginEventWithParameters, EndEventWithParameters, BeginEventWithString, BeginEventWithInteger, AddEventWithString, AddEventWithInteger, EndEventWithParameters, EndEventWithInteger. This was becoming ridiculous, instead made the EventParameters* a required parameter.
* Moves CapturingBoundNetLog / CapturingNetLog to its own file.
BUG=37421
Review URL: http://codereview.chromium.org/1746012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45843 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_client_socket_nss.cc')
| -rw-r--r-- | net/socket/ssl_client_socket_nss.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index a033c79..d3c1f8d 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -292,17 +292,17 @@ int SSLClientSocketNSS::Connect(CompletionCallback* callback) { DCHECK(!user_read_buf_); DCHECK(!user_write_buf_); - net_log_.BeginEvent(NetLog::TYPE_SSL_CONNECT); + net_log_.BeginEvent(NetLog::TYPE_SSL_CONNECT, NULL); int rv = Init(); if (rv != OK) { - net_log_.EndEvent(NetLog::TYPE_SSL_CONNECT); + net_log_.EndEvent(NetLog::TYPE_SSL_CONNECT, NULL); return rv; } rv = InitializeSSLOptions(); if (rv != OK) { - net_log_.EndEvent(NetLog::TYPE_SSL_CONNECT); + net_log_.EndEvent(NetLog::TYPE_SSL_CONNECT, NULL); return rv; } @@ -311,7 +311,7 @@ int SSLClientSocketNSS::Connect(CompletionCallback* callback) { if (rv == ERR_IO_PENDING) { user_connect_callback_ = callback; } else { - net_log_.EndEvent(NetLog::TYPE_SSL_CONNECT); + net_log_.EndEvent(NetLog::TYPE_SSL_CONNECT, NULL); } LeaveFunction(""); @@ -817,7 +817,7 @@ void SSLClientSocketNSS::OnHandshakeIOComplete(int result) { EnterFunction(result); int rv = DoHandshakeLoop(result); if (rv != ERR_IO_PENDING) { - net_log_.EndEvent(net::NetLog::TYPE_SSL_CONNECT); + net_log_.EndEvent(net::NetLog::TYPE_SSL_CONNECT, NULL); DoConnectCallback(rv); } LeaveFunction(""); |