summaryrefslogtreecommitdiffstats
path: root/net/socket_stream
diff options
context:
space:
mode:
authoreroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-27 23:20:45 +0000
committereroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-27 23:20:45 +0000
commitd13f51bc832e8e7965e92f5aa4b16b8c10c3f913 (patch)
treed5a1a413bf8716befbae7d056cd8c6194eed5a98 /net/socket_stream
parentf2286c23e17c0012d53800a5ef28975b6e22393a (diff)
downloadchromium_src-d13f51bc832e8e7965e92f5aa4b16b8c10c3f913.zip
chromium_src-d13f51bc832e8e7965e92f5aa4b16b8c10c3f913.tar.gz
chromium_src-d13f51bc832e8e7965e92f5aa4b16b8c10c3f913.tar.bz2
Cleanup: Address some of the todos in net_log.h
- Get rid of the AddString() and AddStringLiteral() methods. - Make EventParameters able to serialize to JSON, instead of a string. BUG=37421 Review URL: http://codereview.chromium.org/1716007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45750 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket_stream')
-rw-r--r--net/socket_stream/socket_stream.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc
index 5500579..f3fb6d00 100644
--- a/net/socket_stream/socket_stream.cc
+++ b/net/socket_stream/socket_stream.cc
@@ -121,7 +121,7 @@ void SocketStream::Connect() {
// back before returning Connect().
next_state_ = STATE_RESOLVE_PROXY;
net_log_.BeginEventWithString(NetLog::TYPE_SOCKET_STREAM_CONNECT,
- url_.possibly_invalid_spec());
+ "url", url_.possibly_invalid_spec());
MessageLoop::current()->PostTask(
FROM_HERE,
NewRunnableMethod(this, &SocketStream::DoLoop, OK));
@@ -406,7 +406,8 @@ void SocketStream::DoLoop(int result) {
// close the connection.
if (state != STATE_READ_WRITE && result < ERR_IO_PENDING) {
DCHECK_EQ(next_state_, STATE_CLOSE);
- net_log_.EndEventWithInteger(NetLog::TYPE_SOCKET_STREAM_CONNECT, result);
+ net_log_.EndEventWithInteger(NetLog::TYPE_SOCKET_STREAM_CONNECT,
+ "net_error", result);
}
} while (result != ERR_IO_PENDING);
}