Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(734)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/tools/flip_server/spdy_interface_test.cc

Issue 266243004: Clang format slam. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« net/base/mime_util_unittest.cc ('K') | « net/tools/flip_server/spdy_interface.cc ('k') | net/tools/flip_server/spdy_ssl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/tools/flip_server/spdy_interface_test.cc
diff --git a/net/tools/flip_server/spdy_interface_test.cc b/net/tools/flip_server/spdy_interface_test.cc
index 8b340a86180159948d58be71cd0494a2253f4df5..f65db4ff5ceb189e06cbcd9abc8abf33029fa403 100644
--- a/net/tools/flip_server/spdy_interface_test.cc
+++ b/net/tools/flip_server/spdy_interface_test.cc
@@ -54,10 +54,8 @@ class SpdyFramerVisitor : public BufferedSpdyFramerVisitorInterface {
MOCK_METHOD3(OnSynReply, void(SpdyStreamId, bool, const SpdyHeaderBlock&));
MOCK_METHOD3(OnHeaders, void(SpdyStreamId, bool, const SpdyHeaderBlock&));
MOCK_METHOD3(OnDataFrameHeader, void(SpdyStreamId, size_t, bool));
- MOCK_METHOD4(OnStreamFrameData, void(SpdyStreamId,
- const char*,
- size_t,
- bool));
+ MOCK_METHOD4(OnStreamFrameData,
+ void(SpdyStreamId, const char*, size_t, bool));
MOCK_METHOD1(OnSettings, void(bool clear_persisted));
MOCK_METHOD3(OnSetting, void(SpdySettingsIds, uint8, uint32));
MOCK_METHOD2(OnPing, void(SpdyPingId unique_id, bool is_ack));
@@ -220,7 +218,8 @@ TEST_P(SpdySMProxyTest, OnSynStream_SPDY2) {
scoped_ptr<MockSMInterface> mock_interface(new MockSMInterface);
uint32 stream_id = 92;
uint32 associated_id = 43;
- std::string expected = "GET /path HTTP/1.0\r\n"
+ std::string expected =
+ "GET /path HTTP/1.0\r\n"
"Host: 127.0.0.1\r\n"
"hoge: fuga\r\n\r\n";
SpdyHeaderBlock block;
@@ -254,7 +253,8 @@ TEST_P(SpdySMProxyTest, OnSynStream) {
scoped_ptr<MockSMInterface> mock_interface(new MockSMInterface);
uint32 stream_id = 92;
uint32 associated_id = 43;
- std::string expected = "GET /path HTTP/1.1\r\n"
+ std::string expected =
+ "GET /path HTTP/1.1\r\n"
"Host: 127.0.0.1\r\n"
"foo: bar\r\n\r\n";
SpdyHeaderBlock block;
@@ -266,8 +266,7 @@ TEST_P(SpdySMProxyTest, OnSynStream) {
StringSaver saver;
{
InSequence s;
- EXPECT_CALL(*interface_,
- FindOrMakeNewSMConnectionInterface(_, _))
+ EXPECT_CALL(*interface_, FindOrMakeNewSMConnectionInterface(_, _))
.WillOnce(Return(mock_interface.get()));
EXPECT_CALL(*mock_interface, SetStreamID(stream_id));
EXPECT_CALL(*mock_interface, ProcessWriteInput(_, _))
@@ -333,8 +332,7 @@ TEST_P(SpdySMProxyTest, OnStreamFrameData) {
block["foo"] = "bar";
{
InSequence s;
- EXPECT_CALL(*interface_,
- FindOrMakeNewSMConnectionInterface(_, _))
+ EXPECT_CALL(*interface_, FindOrMakeNewSMConnectionInterface(_, _))
.WillOnce(Return(mock_interface.get()));
EXPECT_CALL(*mock_interface, SetStreamID(stream_id));
EXPECT_CALL(*mock_interface, ProcessWriteInput(_, _)).Times(1);
@@ -473,12 +471,11 @@ TEST_P(SpdySMProxyTest, SendErrorNotFound_SPDY2) {
.WillOnce(SaveArg<2>(&actual_header_block));
}
EXPECT_CALL(checkpoint, Call(0));
+ EXPECT_CALL(*spdy_framer_visitor_, OnDataFrameHeader(stream_id, _, true));
EXPECT_CALL(*spdy_framer_visitor_,
- OnDataFrameHeader(stream_id, _, true));
- EXPECT_CALL(*spdy_framer_visitor_,
- OnStreamFrameData(stream_id, _, _, false)).Times(1)
- .WillOnce(DoAll(SaveArg<1>(&actual_data),
- SaveArg<2>(&actual_size)));
+ OnStreamFrameData(stream_id, _, _, false))
+ .Times(1)
+ .WillOnce(DoAll(SaveArg<1>(&actual_data), SaveArg<2>(&actual_size)));
EXPECT_CALL(*spdy_framer_visitor_,
OnStreamFrameData(stream_id, NULL, 0, true)).Times(1);
}
@@ -515,21 +512,18 @@ TEST_P(SpdySMProxyTest, SendErrorNotFound) {
{
InSequence s;
if (GetParam() < SPDY4) {
- EXPECT_CALL(*spdy_framer_visitor_,
- OnSynReply(stream_id, false, _))
+ EXPECT_CALL(*spdy_framer_visitor_, OnSynReply(stream_id, false, _))
.WillOnce(SaveArg<2>(&actual_header_block));
} else {
- EXPECT_CALL(*spdy_framer_visitor_,
- OnHeaders(stream_id, false, _))
+ EXPECT_CALL(*spdy_framer_visitor_, OnHeaders(stream_id, false, _))
.WillOnce(SaveArg<2>(&actual_header_block));
}
EXPECT_CALL(checkpoint, Call(0));
+ EXPECT_CALL(*spdy_framer_visitor_, OnDataFrameHeader(stream_id, _, true));
EXPECT_CALL(*spdy_framer_visitor_,
- OnDataFrameHeader(stream_id, _, true));
- EXPECT_CALL(*spdy_framer_visitor_,
- OnStreamFrameData(stream_id, _, _, false)).Times(1)
- .WillOnce(DoAll(SaveArg<1>(&actual_data),
- SaveArg<2>(&actual_size)));
+ OnStreamFrameData(stream_id, _, _, false))
+ .Times(1)
+ .WillOnce(DoAll(SaveArg<1>(&actual_data), SaveArg<2>(&actual_size)));
EXPECT_CALL(*spdy_framer_visitor_,
OnStreamFrameData(stream_id, NULL, 0, true)).Times(1);
}
@@ -702,8 +696,7 @@ TEST_P(SpdySMProxyTest, SendDataFrame) {
{
InSequence s;
- EXPECT_CALL(*spdy_framer_visitor_,
- OnDataFrameHeader(stream_id, _, false));
+ EXPECT_CALL(*spdy_framer_visitor_, OnDataFrameHeader(stream_id, _, false));
EXPECT_CALL(*spdy_framer_visitor_,
OnStreamFrameData(stream_id, _, _, false))
.WillOnce(DoAll(SaveArg<1>(&actual_data), SaveArg<2>(&actual_size)));
@@ -727,12 +720,11 @@ TEST_P(SpdySMProxyTest, SendLongDataFrame) {
{
InSequence s;
for (int i = 0; i < 3; ++i) {
- EXPECT_CALL(*spdy_framer_visitor_,
- OnDataFrameHeader(stream_id, _, false));
- EXPECT_CALL(*spdy_framer_visitor_,
- OnStreamFrameData(stream_id, _, _, false))
- .WillOnce(DoAll(SaveArg<1>(&actual_data),
- SaveArg<2>(&actual_size)));
+ EXPECT_CALL(*spdy_framer_visitor_,
+ OnDataFrameHeader(stream_id, _, false));
+ EXPECT_CALL(*spdy_framer_visitor_,
+ OnStreamFrameData(stream_id, _, _, false))
+ .WillOnce(DoAll(SaveArg<1>(&actual_data), SaveArg<2>(&actual_size)));
}
}
@@ -856,12 +848,11 @@ TEST_P(SpdySMServerTest, NewStreamError) {
.WillOnce(SaveArg<2>(&actual_header_block));
}
EXPECT_CALL(checkpoint, Call(0));
+ EXPECT_CALL(*spdy_framer_visitor_, OnDataFrameHeader(stream_id, _, true));
EXPECT_CALL(*spdy_framer_visitor_,
- OnDataFrameHeader(stream_id, _, true));
- EXPECT_CALL(*spdy_framer_visitor_,
- OnStreamFrameData(stream_id, _, _, false)).Times(1)
- .WillOnce(DoAll(SaveArg<1>(&actual_data),
- SaveArg<2>(&actual_size)));
+ OnStreamFrameData(stream_id, _, _, false))
+ .Times(1)
+ .WillOnce(DoAll(SaveArg<1>(&actual_data), SaveArg<2>(&actual_size)));
EXPECT_CALL(*spdy_framer_visitor_,
OnStreamFrameData(stream_id, NULL, 0, true)).Times(1);
}
« net/base/mime_util_unittest.cc ('K') | « net/tools/flip_server/spdy_interface.cc ('k') | net/tools/flip_server/spdy_ssl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698