Index: net/spdy/spdy_websocket_test_util.cc |
diff --git a/net/spdy/spdy_websocket_test_util.cc b/net/spdy/spdy_websocket_test_util.cc |
index 0e09453b347ebf55112b0248452576a01de35d8a..fce407713bcae86966be79e477f0057a59623109 100644 |
--- a/net/spdy/spdy_websocket_test_util.cc |
+++ b/net/spdy/spdy_websocket_test_util.cc |
@@ -14,8 +14,9 @@ const bool kDefaultCompressed = false; |
const char* const kDefaultDataPointer = NULL; |
const uint32 kDefaultDataLength = 0; |
-SpdyWebSocketTestUtil::SpdyWebSocketTestUtil( |
- NextProto protocol) : spdy_util_(protocol) {} |
+SpdyWebSocketTestUtil::SpdyWebSocketTestUtil(NextProto protocol) |
+ : spdy_util_(protocol) { |
+} |
std::string SpdyWebSocketTestUtil::GetHeader(const SpdyHeaderBlock& headers, |
const std::string& key) const { |
@@ -23,10 +24,9 @@ std::string SpdyWebSocketTestUtil::GetHeader(const SpdyHeaderBlock& headers, |
return (it == headers.end()) ? "" : it->second; |
} |
-void SpdyWebSocketTestUtil::SetHeader( |
- const std::string& key, |
- const std::string& value, |
- SpdyHeaderBlock* headers) const { |
+void SpdyWebSocketTestUtil::SetHeader(const std::string& key, |
+ const std::string& value, |
+ SpdyHeaderBlock* headers) const { |
(*headers)[GetHeaderKey(key)] = value; |
} |
@@ -69,23 +69,20 @@ SpdyFrame* SpdyWebSocketTestUtil::ConstructSpdyWebSocketHandshakeRequestFrame( |
RequestPriority request_priority) { |
// SPDY SYN_STREAM control frame header. |
const SpdyHeaderInfo kSynStreamHeader = { |
- SYN_STREAM, |
- stream_id, |
- kDefaultAssociatedStreamId, |
- ConvertRequestPriorityToSpdyPriority(request_priority, SPDY2), |
- kSpdyCredentialSlotUnused, |
- CONTROL_FLAG_NONE, |
- kDefaultCompressed, |
- RST_STREAM_INVALID, |
- kDefaultDataPointer, |
- kDefaultDataLength, |
- DATA_FLAG_NONE |
- }; |
+ SYN_STREAM, |
+ stream_id, |
+ kDefaultAssociatedStreamId, |
+ ConvertRequestPriorityToSpdyPriority(request_priority, SPDY2), |
+ kSpdyCredentialSlotUnused, |
+ CONTROL_FLAG_NONE, |
+ kDefaultCompressed, |
+ RST_STREAM_INVALID, |
+ kDefaultDataPointer, |
+ kDefaultDataLength, |
+ DATA_FLAG_NONE}; |
// Construct SPDY SYN_STREAM control frame. |
- return spdy_util_.ConstructSpdyFrame( |
- kSynStreamHeader, |
- headers.Pass()); |
+ return spdy_util_.ConstructSpdyFrame(kSynStreamHeader, headers.Pass()); |
} |
SpdyFrame* SpdyWebSocketTestUtil::ConstructSpdyWebSocketHandshakeResponseFrame( |
@@ -94,23 +91,20 @@ SpdyFrame* SpdyWebSocketTestUtil::ConstructSpdyWebSocketHandshakeResponseFrame( |
RequestPriority request_priority) { |
// SPDY SYN_REPLY control frame header. |
const SpdyHeaderInfo kSynReplyHeader = { |
- SYN_REPLY, |
- stream_id, |
- kDefaultAssociatedStreamId, |
- ConvertRequestPriorityToSpdyPriority(request_priority, SPDY2), |
- kSpdyCredentialSlotUnused, |
- CONTROL_FLAG_NONE, |
- kDefaultCompressed, |
- RST_STREAM_INVALID, |
- kDefaultDataPointer, |
- kDefaultDataLength, |
- DATA_FLAG_NONE |
- }; |
+ SYN_REPLY, |
+ stream_id, |
+ kDefaultAssociatedStreamId, |
+ ConvertRequestPriorityToSpdyPriority(request_priority, SPDY2), |
+ kSpdyCredentialSlotUnused, |
+ CONTROL_FLAG_NONE, |
+ kDefaultCompressed, |
+ RST_STREAM_INVALID, |
+ kDefaultDataPointer, |
+ kDefaultDataLength, |
+ DATA_FLAG_NONE}; |
// Construct SPDY SYN_REPLY control frame. |
- return spdy_util_.ConstructSpdyFrame( |
- kSynReplyHeader, |
- headers.Pass()); |
+ return spdy_util_.ConstructSpdyFrame(kSynReplyHeader, headers.Pass()); |
} |
SpdyFrame* SpdyWebSocketTestUtil::ConstructSpdyWebSocketHeadersFrame( |
@@ -135,14 +129,10 @@ SpdyFrame* SpdyWebSocketTestUtil::ConstructSpdyWebSocketDataFrame( |
int len, |
SpdyStreamId stream_id, |
bool fin) { |
- |
// Construct SPDY data frame. |
BufferedSpdyFramer framer(spdy_util_.spdy_version(), false); |
return framer.CreateDataFrame( |
- stream_id, |
- data, |
- len, |
- fin ? DATA_FLAG_FIN : DATA_FLAG_NONE); |
+ stream_id, data, len, fin ? DATA_FLAG_FIN : DATA_FLAG_NONE); |
} |
SpdyFrame* SpdyWebSocketTestUtil::ConstructSpdySettings( |
@@ -154,8 +144,7 @@ SpdyMajorVersion SpdyWebSocketTestUtil::spdy_version() const { |
return spdy_util_.spdy_version(); |
} |
-std::string SpdyWebSocketTestUtil::GetHeaderKey( |
- const std::string& key) const { |
+std::string SpdyWebSocketTestUtil::GetHeaderKey(const std::string& key) const { |
return (spdy_util_.is_spdy2() ? "" : ":") + key; |
} |