| Index: net/tools/quic/spdy_utils.cc
|
| diff --git a/net/tools/quic/spdy_utils.cc b/net/tools/quic/spdy_utils.cc
|
| index c652322b370740e4dbc47291cbe7834d11f9eda5..c188708f9dc02bb9c28cba3e0880ba6d812c1820 100644
|
| --- a/net/tools/quic/spdy_utils.cc
|
| +++ b/net/tools/quic/spdy_utils.cc
|
| @@ -34,7 +34,7 @@ void PopulateSpdyHeaderBlock(const BalsaHeaders& headers,
|
| SpdyHeaderBlock* block,
|
| bool allow_empty_values) {
|
| for (BalsaHeaders::const_header_lines_iterator hi =
|
| - headers.header_lines_begin();
|
| + headers.header_lines_begin();
|
| hi != headers.header_lines_end();
|
| ++hi) {
|
| if ((hi->second.length() == 0) && !allow_empty_values) {
|
| @@ -89,8 +89,7 @@ void PopulateSpdyResponseHeaderBlock(const BalsaHeaders& headers,
|
| status.append(" ");
|
| status.append(headers.response_reason_phrase().as_string());
|
| (*block)[kV3Status] = status;
|
| - (*block)[kV3Version] =
|
| - headers.response_version().as_string();
|
| + (*block)[kV3Version] = headers.response_version().as_string();
|
|
|
| // Empty header values are only allowed because this is spdy3.
|
| PopulateSpdyHeaderBlock(headers, block, true);
|
| @@ -165,7 +164,7 @@ string SpdyUtils::SerializeUncompressedHeaders(const SpdyHeaderBlock& headers) {
|
| }
|
|
|
| bool IsSpecialSpdyHeader(SpdyHeaderBlock::const_iterator header,
|
| - BalsaHeaders* headers) {
|
| + BalsaHeaders* headers) {
|
| if (header->first.empty() || header->second.empty()) {
|
| return true;
|
| }
|
| @@ -173,9 +172,8 @@ bool IsSpecialSpdyHeader(SpdyHeaderBlock::const_iterator header,
|
| return header_name.c_str()[0] == ':';
|
| }
|
|
|
| -bool SpdyUtils::FillBalsaRequestHeaders(
|
| - const SpdyHeaderBlock& header_block,
|
| - BalsaHeaders* request_headers) {
|
| +bool SpdyUtils::FillBalsaRequestHeaders(const SpdyHeaderBlock& header_block,
|
| + BalsaHeaders* request_headers) {
|
| typedef SpdyHeaderBlock::const_iterator BlockIt;
|
|
|
| BlockIt host_it = header_block.find(kV3Host);
|
| @@ -204,9 +202,9 @@ bool SpdyUtils::FillBalsaRequestHeaders(
|
| }
|
|
|
| for (BlockIt it = header_block.begin(); it != header_block.end(); ++it) {
|
| - if (!IsSpecialSpdyHeader(it, request_headers)) {
|
| - request_headers->AppendHeader(it->first, it->second);
|
| - }
|
| + if (!IsSpecialSpdyHeader(it, request_headers)) {
|
| + request_headers->AppendHeader(it->first, it->second);
|
| + }
|
| }
|
|
|
| return true;
|
| @@ -238,9 +236,8 @@ bool ParseReasonAndStatus(StringPiece status_and_reason,
|
| return true;
|
| }
|
|
|
| -bool SpdyUtils::FillBalsaResponseHeaders(
|
| - const SpdyHeaderBlock& header_block,
|
| - BalsaHeaders* request_headers) {
|
| +bool SpdyUtils::FillBalsaResponseHeaders(const SpdyHeaderBlock& header_block,
|
| + BalsaHeaders* request_headers) {
|
| typedef SpdyHeaderBlock::const_iterator BlockIt;
|
|
|
| BlockIt status_it = header_block.find(kV3Status);
|
| @@ -255,9 +252,9 @@ bool SpdyUtils::FillBalsaResponseHeaders(
|
| }
|
| request_headers->SetResponseVersion(version_it->second);
|
| for (BlockIt it = header_block.begin(); it != header_block.end(); ++it) {
|
| - if (!IsSpecialSpdyHeader(it, request_headers)) {
|
| - request_headers->AppendHeader(it->first, it->second);
|
| - }
|
| + if (!IsSpecialSpdyHeader(it, request_headers)) {
|
| + request_headers->AppendHeader(it->first, it->second);
|
| + }
|
| }
|
| return true;
|
| }
|
|
|