| Index: net/spdy/spdy_http_stream.cc
|
| ===================================================================
|
| --- net/spdy/spdy_http_stream.cc (revision 154321)
|
| +++ net/spdy/spdy_http_stream.cc (working copy)
|
| @@ -23,28 +23,12 @@
|
| #include "net/http/http_request_info.h"
|
| #include "net/http/http_response_info.h"
|
| #include "net/http/http_util.h"
|
| +#include "net/spdy/spdy_header_block.h"
|
| #include "net/spdy/spdy_http_utils.h"
|
| #include "net/spdy/spdy_session.h"
|
|
|
| namespace net {
|
|
|
| -namespace {
|
| -
|
| -Value* NetLogSpdySendRequestCallback(const SpdyHeaderBlock* headers,
|
| - NetLog::LogLevel /* log_level */) {
|
| - DictionaryValue* dict = new DictionaryValue();
|
| - ListValue* headers_list = new ListValue();
|
| - for (SpdyHeaderBlock::const_iterator it = headers->begin();
|
| - it != headers->end(); ++it) {
|
| - headers_list->Append(new StringValue(base::StringPrintf(
|
| - "%s: %s", it->first.c_str(), it->second.c_str())));
|
| - }
|
| - dict->Set("headers", headers_list);
|
| - return dict;
|
| -}
|
| -
|
| -} // namespace
|
| -
|
| SpdyHttpStream::SpdyHttpStream(SpdySession* spdy_session,
|
| bool direct)
|
| : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
|
| @@ -221,7 +205,7 @@
|
| direct_);
|
| stream_->net_log().AddEvent(
|
| NetLog::TYPE_HTTP_TRANSACTION_SPDY_SEND_REQUEST_HEADERS,
|
| - base::Bind(&NetLogSpdySendRequestCallback, headers.get()));
|
| + base::Bind(&SpdyHeaderBlockNetLogCallback, headers.get()));
|
| stream_->set_spdy_headers(headers.Pass());
|
|
|
| stream_->SetRequestTime(request_time);
|
|
|