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/spdy/spdy_stream.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/spdy/spdy_stream.cc')
-rw-r--r-- | net/spdy/spdy_stream.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/spdy/spdy_stream.cc b/net/spdy/spdy_stream.cc index 5382f6c..f2ea36c 100644 --- a/net/spdy/spdy_stream.cc +++ b/net/spdy/spdy_stream.cc @@ -301,29 +301,29 @@ int SpdyStream::DoLoop(int result) { // State machine 1: Send headers and wait for response headers. case STATE_SEND_HEADERS: CHECK_EQ(OK, result); - net_log_.BeginEvent(NetLog::TYPE_SPDY_STREAM_SEND_HEADERS); + net_log_.BeginEvent(NetLog::TYPE_SPDY_STREAM_SEND_HEADERS, NULL); result = DoSendHeaders(); break; case STATE_SEND_HEADERS_COMPLETE: - net_log_.EndEvent(NetLog::TYPE_SPDY_STREAM_SEND_HEADERS); + net_log_.EndEvent(NetLog::TYPE_SPDY_STREAM_SEND_HEADERS, NULL); result = DoSendHeadersComplete(result); break; case STATE_SEND_BODY: CHECK_EQ(OK, result); - net_log_.BeginEvent(NetLog::TYPE_SPDY_STREAM_SEND_BODY); + net_log_.BeginEvent(NetLog::TYPE_SPDY_STREAM_SEND_BODY, NULL); result = DoSendBody(); break; case STATE_SEND_BODY_COMPLETE: - net_log_.EndEvent(NetLog::TYPE_SPDY_STREAM_SEND_BODY); + net_log_.EndEvent(NetLog::TYPE_SPDY_STREAM_SEND_BODY, NULL); result = DoSendBodyComplete(result); break; case STATE_READ_HEADERS: CHECK_EQ(OK, result); - net_log_.BeginEvent(NetLog::TYPE_SPDY_STREAM_READ_HEADERS); + net_log_.BeginEvent(NetLog::TYPE_SPDY_STREAM_READ_HEADERS, NULL); result = DoReadHeaders(); break; case STATE_READ_HEADERS_COMPLETE: - net_log_.EndEvent(NetLog::TYPE_SPDY_STREAM_READ_HEADERS); + net_log_.EndEvent(NetLog::TYPE_SPDY_STREAM_READ_HEADERS, NULL); result = DoReadHeadersComplete(result); break; @@ -332,11 +332,11 @@ int SpdyStream::DoLoop(int result) { // the OnDataReceived()/OnClose()/ReadResponseHeaders()/etc. Only reason // to do this is for consistency with the Http code. case STATE_READ_BODY: - net_log_.BeginEvent(NetLog::TYPE_SPDY_STREAM_READ_BODY); + net_log_.BeginEvent(NetLog::TYPE_SPDY_STREAM_READ_BODY, NULL); result = DoReadBody(); break; case STATE_READ_BODY_COMPLETE: - net_log_.EndEvent(NetLog::TYPE_SPDY_STREAM_READ_BODY); + net_log_.EndEvent(NetLog::TYPE_SPDY_STREAM_READ_BODY, NULL); result = DoReadBodyComplete(result); break; case STATE_DONE: |