Index: net/spdy/buffered_spdy_framer_unittest.cc |
diff --git a/net/spdy/buffered_spdy_framer_unittest.cc b/net/spdy/buffered_spdy_framer_unittest.cc |
index 0f7bf3154e3d035713aaa5e7209981f63675dfb6..8429a4f4454b90f85421ff3b53dd77bf024a1923 100644 |
--- a/net/spdy/buffered_spdy_framer_unittest.cc |
+++ b/net/spdy/buffered_spdy_framer_unittest.cc |
@@ -20,18 +20,16 @@ class TestBufferedSpdyVisitor : public BufferedSpdyFramerVisitorInterface { |
syn_frame_count_(0), |
syn_reply_frame_count_(0), |
headers_frame_count_(0), |
- header_stream_id_(-1) { |
- } |
+ header_stream_id_(-1) {} |
virtual void OnError(SpdyFramer::SpdyError error_code) OVERRIDE { |
LOG(INFO) << "SpdyFramer Error: " << error_code; |
error_count_++; |
} |
- virtual void OnStreamError( |
- SpdyStreamId stream_id, |
- const std::string& description) OVERRIDE { |
- LOG(INFO) << "SpdyFramer Error on stream: " << stream_id << " " |
+ virtual void OnStreamError(SpdyStreamId stream_id, |
+ const std::string& description) OVERRIDE { |
+ LOG(INFO) << "SpdyFramer Error on stream: " << stream_id << " " |
<< description; |
error_count_++; |
} |
@@ -90,12 +88,10 @@ class TestBufferedSpdyVisitor : public BufferedSpdyFramerVisitorInterface { |
virtual void OnPing(SpdyPingId unique_id, bool is_ack) OVERRIDE {} |
virtual void OnRstStream(SpdyStreamId stream_id, |
- SpdyRstStreamStatus status) OVERRIDE { |
- } |
+ SpdyRstStreamStatus status) OVERRIDE {} |
virtual void OnGoAway(SpdyStreamId last_accepted_stream_id, |
- SpdyGoAwayStatus status) OVERRIDE { |
- } |
+ SpdyGoAwayStatus status) OVERRIDE {} |
bool OnCredentialFrameData(const char*, size_t) { |
LOG(FATAL) << "Unexpected OnCredentialFrameData call."; |
@@ -153,9 +149,8 @@ class TestBufferedSpdyVisitor : public BufferedSpdyFramerVisitorInterface { |
} // namespace |
-class BufferedSpdyFramerTest |
- : public PlatformTest, |
- public ::testing::WithParamInterface<NextProto> { |
+class BufferedSpdyFramerTest : public PlatformTest, |
+ public ::testing::WithParamInterface<NextProto> { |
protected: |
// Returns true if the two header blocks have equivalent content. |
bool CompareHeaderBlocks(const SpdyHeaderBlock* expected, |
@@ -189,11 +184,12 @@ class BufferedSpdyFramerTest |
} |
}; |
-INSTANTIATE_TEST_CASE_P( |
- NextProto, |
- BufferedSpdyFramerTest, |
- testing::Values(kProtoDeprecatedSPDY2, |
- kProtoSPDY3, kProtoSPDY31, kProtoSPDY4)); |
+INSTANTIATE_TEST_CASE_P(NextProto, |
+ BufferedSpdyFramerTest, |
+ testing::Values(kProtoDeprecatedSPDY2, |
+ kProtoSPDY3, |
+ kProtoSPDY31, |
+ kProtoSPDY4)); |
TEST_P(BufferedSpdyFramerTest, OnSetting) { |
SpdyFramer framer(spdy_version()); |
@@ -216,9 +212,9 @@ TEST_P(BufferedSpdyFramerTest, ReadSynStreamHeaderBlock) { |
headers["bb"] = "ww"; |
BufferedSpdyFramer framer(spdy_version(), true); |
scoped_ptr<SpdyFrame> control_frame( |
- framer.CreateSynStream(1, // stream_id |
- 0, // associated_stream_id |
- 1, // priority |
+ framer.CreateSynStream(1, // stream_id |
+ 0, // associated_stream_id |
+ 1, // priority |
CONTROL_FLAG_NONE, |
&headers)); |
EXPECT_TRUE(control_frame.get() != NULL); |
@@ -239,10 +235,9 @@ TEST_P(BufferedSpdyFramerTest, ReadSynReplyHeaderBlock) { |
headers["alpha"] = "beta"; |
headers["gamma"] = "delta"; |
BufferedSpdyFramer framer(spdy_version(), true); |
- scoped_ptr<SpdyFrame> control_frame( |
- framer.CreateSynReply(1, // stream_id |
- CONTROL_FLAG_NONE, |
- &headers)); |
+ scoped_ptr<SpdyFrame> control_frame(framer.CreateSynReply(1, // stream_id |
+ CONTROL_FLAG_NONE, |
+ &headers)); |
EXPECT_TRUE(control_frame.get() != NULL); |
TestBufferedSpdyVisitor visitor(spdy_version()); |
@@ -251,7 +246,7 @@ TEST_P(BufferedSpdyFramerTest, ReadSynReplyHeaderBlock) { |
control_frame.get()->size()); |
EXPECT_EQ(0, visitor.error_count_); |
EXPECT_EQ(0, visitor.syn_frame_count_); |
- if(spdy_version() < SPDY4) { |
+ if (spdy_version() < SPDY4) { |
EXPECT_EQ(1, visitor.syn_reply_frame_count_); |
EXPECT_EQ(0, visitor.headers_frame_count_); |
} else { |
@@ -266,10 +261,9 @@ TEST_P(BufferedSpdyFramerTest, ReadHeadersHeaderBlock) { |
headers["alpha"] = "beta"; |
headers["gamma"] = "delta"; |
BufferedSpdyFramer framer(spdy_version(), true); |
- scoped_ptr<SpdyFrame> control_frame( |
- framer.CreateHeaders(1, // stream_id |
- CONTROL_FLAG_NONE, |
- &headers)); |
+ scoped_ptr<SpdyFrame> control_frame(framer.CreateHeaders(1, // stream_id |
+ CONTROL_FLAG_NONE, |
+ &headers)); |
EXPECT_TRUE(control_frame.get() != NULL); |
TestBufferedSpdyVisitor visitor(spdy_version()); |