Index: net/spdy/spdy_test_util_common.h |
diff --git a/net/spdy/spdy_test_util_common.h b/net/spdy/spdy_test_util_common.h |
index a16cdd8b397a52a92218a752803b9e879d83246e..491735f401a7b3dbf01eef96b3dc3cf2e190866e 100644 |
--- a/net/spdy/spdy_test_util_common.h |
+++ b/net/spdy/spdy_test_util_common.h |
@@ -46,7 +46,7 @@ class SpdyStreamRequest; |
// data frames. |
const char kDefaultURL[] = "http://www.google.com"; |
const char kUploadData[] = "hello!"; |
-const int kUploadDataSize = arraysize(kUploadData)-1; |
+const int kUploadDataSize = arraysize(kUploadData) - 1; |
// SpdyNextProtos returns a vector of next protocols for negotiating |
// SPDY. |
@@ -101,8 +101,10 @@ MockRead CreateMockRead(const SpdyFrame& resp, int seq, IoMode mode); |
// Combines the given SpdyFrames into the given char array and returns |
// the total length. |
-int CombineFrames(const SpdyFrame** frames, int num_frames, |
- char* buff, int buff_len); |
+int CombineFrames(const SpdyFrame** frames, |
+ int num_frames, |
+ char* buff, |
+ int buff_len); |
// Returns the SpdyPriority embedded in the given frame. Returns true |
// and fills in |priority| on success. |
@@ -316,9 +318,8 @@ class SpdyTestUtil { |
// Construct a SPDY frame. If it is a SYN_STREAM or SYN_REPLY frame (as |
// specified in header_info.kind), the provided headers are included in the |
// frame. |
- SpdyFrame* ConstructSpdyFrame( |
- const SpdyHeaderInfo& header_info, |
- scoped_ptr<SpdyHeaderBlock> headers) const; |
+ SpdyFrame* ConstructSpdyFrame(const SpdyHeaderInfo& header_info, |
+ scoped_ptr<SpdyHeaderBlock> headers) const; |
// Construct a SPDY frame. If it is a SYN_STREAM or SYN_REPLY frame (as |
// specified in header_info.kind), the headers provided in extra_headers and |
@@ -331,14 +332,13 @@ class SpdyTestUtil { |
int tail_header_count) const; |
// Construct a generic SpdyControlFrame. |
- SpdyFrame* ConstructSpdyControlFrame( |
- scoped_ptr<SpdyHeaderBlock> headers, |
- bool compressed, |
- SpdyStreamId stream_id, |
- RequestPriority request_priority, |
- SpdyFrameType type, |
- SpdyControlFlags flags, |
- SpdyStreamId associated_stream_id) const; |
+ SpdyFrame* ConstructSpdyControlFrame(scoped_ptr<SpdyHeaderBlock> headers, |
+ bool compressed, |
+ SpdyStreamId stream_id, |
+ RequestPriority request_priority, |
+ SpdyFrameType type, |
+ SpdyControlFlags flags, |
+ SpdyStreamId associated_stream_id) const; |
// Construct a generic SpdyControlFrame. |
// |
@@ -346,17 +346,16 @@ class SpdyTestUtil { |
// extra_headers (so half the number of elements), but tail_headers_size is |
// the actual number of elements (both keys and values) in tail_headers. |
// TODO(ttuttle): Fix this inconsistency. |
- SpdyFrame* ConstructSpdyControlFrame( |
- const char* const extra_headers[], |
- int extra_header_count, |
- bool compressed, |
- SpdyStreamId stream_id, |
- RequestPriority request_priority, |
- SpdyFrameType type, |
- SpdyControlFlags flags, |
- const char* const* tail_headers, |
- int tail_headers_size, |
- SpdyStreamId associated_stream_id) const; |
+ SpdyFrame* ConstructSpdyControlFrame(const char* const extra_headers[], |
+ int extra_header_count, |
+ bool compressed, |
+ SpdyStreamId stream_id, |
+ RequestPriority request_priority, |
+ SpdyFrameType type, |
+ SpdyControlFlags flags, |
+ const char* const* tail_headers, |
+ int tail_headers_size, |
+ SpdyStreamId associated_stream_id) const; |
// Construct an expected SPDY reply string from the given headers. |
std::string ConstructSpdyReplyString(const SpdyHeaderBlock& headers) const; |
@@ -380,9 +379,8 @@ class SpdyTestUtil { |
// Construct a SPDY WINDOW_UPDATE frame. |
// Returns the constructed frame. The caller takes ownership of the frame. |
- SpdyFrame* ConstructSpdyWindowUpdate( |
- SpdyStreamId stream_id, |
- uint32 delta_window_size) const; |
+ SpdyFrame* ConstructSpdyWindowUpdate(SpdyStreamId stream_id, |
+ uint32 delta_window_size) const; |
// Construct a SPDY RST_STREAM frame. |
// Returns the constructed frame. The caller takes ownership of the frame. |
@@ -495,12 +493,13 @@ class SpdyTestUtil { |
int extra_header_count); |
// Constructs a single SPDY data frame with the contents "hello!" |
- SpdyFrame* ConstructSpdyBodyFrame(int stream_id, |
- bool fin); |
+ SpdyFrame* ConstructSpdyBodyFrame(int stream_id, bool fin); |
// Constructs a single SPDY data frame with the given content. |
- SpdyFrame* ConstructSpdyBodyFrame(int stream_id, const char* data, |
- uint32 len, bool fin); |
+ SpdyFrame* ConstructSpdyBodyFrame(int stream_id, |
+ const char* data, |
+ uint32 len, |
+ bool fin); |
// Wraps |frame| in the payload of a data frame in stream |stream_id|. |
SpdyFrame* ConstructWrappedSpdyFrame(const scoped_ptr<SpdyFrame>& frame, |
@@ -530,10 +529,9 @@ class SpdyTestUtil { |
private: |
// |content_length| may be NULL, in which case the content-length |
// header will be omitted. |
- scoped_ptr<SpdyHeaderBlock> ConstructHeaderBlock( |
- base::StringPiece method, |
- base::StringPiece url, |
- int64* content_length) const; |
+ scoped_ptr<SpdyHeaderBlock> ConstructHeaderBlock(base::StringPiece method, |
+ base::StringPiece url, |
+ int64* content_length) const; |
const NextProto protocol_; |
const SpdyMajorVersion spdy_version_; |