net/spdy/spdy_stream_unittest.cc - Issue 266243004: Clang format slam.

Unified Diff: net/spdy/spdy_stream_unittest.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

Index: net/spdy/spdy_stream_unittest.cc

diff --git a/net/spdy/spdy_stream_unittest.cc b/net/spdy/spdy_stream_unittest.cc

index 8f46abe083b16d242c9a36a14ec34279d415344f..f89d45db9bd5dcb1b7a2af827c897a421416aaad 100644

--- a/net/spdy/spdy_stream_unittest.cc

+++ b/net/spdy/spdy_stream_unittest.cc

@@ -46,9 +46,7 @@ class SpdyStreamTest : public ::testing::Test,

UnstallFunction;

SpdyStreamTest()

- : spdy_util_(GetParam()),

- session_deps_(GetParam()),

- offset_(0) {}

+ : spdy_util_(GetParam()), session_deps_(GetParam()), offset_(0) {}

base::WeakPtr<SpdySession> CreateDefaultSpdySession() {

SpdySessionKey key(HostPortPair("www.google.com", 80),

@@ -57,9 +55,7 @@ class SpdyStreamTest : public ::testing::Test,

return CreateInsecureSpdySession(session_, key, BoundNetLog());

}

- virtual void TearDown() {

- base::MessageLoop::current()->RunUntilIdle();

- }

+ virtual void TearDown() { base::MessageLoop::current()->RunUntilIdle(); }

void RunResumeAfterUnstallRequestResponseTest(

const UnstallFunction& unstall_function);

@@ -78,25 +74,15 @@ class SpdyStreamTest : public ::testing::Test,

writes_.push_back(CreateMockWrite(frame, offset_++));

}

- void AddReadEOF() {

- reads_.push_back(MockRead(ASYNC, 0, offset_++));

- }

+ void AddReadEOF() { reads_.push_back(MockRead(ASYNC, 0, offset_++)); }

- MockRead* GetReads() {

- return vector_as_array(&reads_);

- }

+ MockRead* GetReads() { return vector_as_array(&reads_); }

- size_t GetNumReads() const {

- return reads_.size();

- }

+ size_t GetNumReads() const { return reads_.size(); }

- MockWrite* GetWrites() {

- return vector_as_array(&writes_);

- }

+ MockWrite* GetWrites() { return vector_as_array(&writes_); }

- int GetNumWrites() const {

- return writes_.size();

- }

+ int GetNumWrites() const { return writes_.size(); }

SpdyTestUtil spdy_util_;

SpdySessionDependencies session_deps_;

@@ -109,24 +95,23 @@ class SpdyStreamTest : public ::testing::Test,

int offset_;

};

-INSTANTIATE_TEST_CASE_P(

- NextProto,

- SpdyStreamTest,

- testing::Values(kProtoDeprecatedSPDY2,

- kProtoSPDY3, kProtoSPDY31, kProtoSPDY4));

+INSTANTIATE_TEST_CASE_P(NextProto,

+ SpdyStreamTest,

+ testing::Values(kProtoDeprecatedSPDY2,

+ kProtoSPDY3,

+ kProtoSPDY31,

+ kProtoSPDY4));

TEST_P(SpdyStreamTest, SendDataAfterOpen) {

GURL url(kStreamUrl);

session_ = SpdySessionDependencies::SpdyCreateSession(&session_deps_);

- scoped_ptr<SpdyFrame> req(

- spdy_util_.ConstructSpdyPost(

- kStreamUrl, 1, kPostBodyLength, LOWEST, NULL, 0));

+ scoped_ptr<SpdyFrame> req(spdy_util_.ConstructSpdyPost(

+ kStreamUrl, 1, kPostBodyLength, LOWEST, NULL, 0));

AddWrite(*req);

- scoped_ptr<SpdyFrame> resp(

- spdy_util_.ConstructSpdyPostSynReply(NULL, 0));

+ scoped_ptr<SpdyFrame> resp(spdy_util_.ConstructSpdyPostSynReply(NULL, 0));

AddRead(*resp);

scoped_ptr<SpdyFrame> msg(

@@ -139,8 +124,8 @@ TEST_P(SpdyStreamTest, SendDataAfterOpen) {

AddReadEOF();

- OrderedSocketData data(GetReads(), GetNumReads(),

- GetWrites(), GetNumWrites());

+ OrderedSocketData data(

+ GetReads(), GetNumReads(), GetWrites(), GetNumWrites());

MockConnect connect_data(SYNCHRONOUS, OK);

data.set_connect_data(connect_data);

@@ -148,9 +133,8 @@ TEST_P(SpdyStreamTest, SendDataAfterOpen) {

base::WeakPtr<SpdySession> session(CreateDefaultSpdySession());

- base::WeakPtr<SpdyStream> stream =

- CreateStreamSynchronously(

- SPDY_BIDIRECTIONAL_STREAM, session, url, LOWEST, BoundNetLog());

+ base::WeakPtr<SpdyStream> stream = CreateStreamSynchronously(

+ SPDY_BIDIRECTIONAL_STREAM, session, url, LOWEST, BoundNetLog());

ASSERT_TRUE(stream.get() != NULL);

StreamDelegateSendImmediate delegate(stream, kPostBodyStringPiece);

@@ -179,8 +163,8 @@ TEST_P(SpdyStreamTest, PushedStream) {

AddReadEOF();

- OrderedSocketData data(GetReads(), GetNumReads(),

- GetWrites(), GetNumWrites());

+ OrderedSocketData data(

+ GetReads(), GetNumReads(), GetWrites(), GetNumWrites());

MockConnect connect_data(SYNCHRONOUS, OK);

data.set_connect_data(connect_data);

@@ -229,13 +213,11 @@ TEST_P(SpdyStreamTest, StreamError) {

session_ = SpdySessionDependencies::SpdyCreateSession(&session_deps_);

- scoped_ptr<SpdyFrame> req(

- spdy_util_.ConstructSpdyPost(

- kStreamUrl, 1, kPostBodyLength, LOWEST, NULL, 0));

+ scoped_ptr<SpdyFrame> req(spdy_util_.ConstructSpdyPost(

+ kStreamUrl, 1, kPostBodyLength, LOWEST, NULL, 0));

AddWrite(*req);

- scoped_ptr<SpdyFrame> resp(

- spdy_util_.ConstructSpdyGetSynReply(NULL, 0, 1));

+ scoped_ptr<SpdyFrame> resp(spdy_util_.ConstructSpdyGetSynReply(NULL, 0, 1));

AddRead(*resp);

scoped_ptr<SpdyFrame> msg(

@@ -250,8 +232,8 @@ TEST_P(SpdyStreamTest, StreamError) {

CapturingBoundNetLog log;

- OrderedSocketData data(GetReads(), GetNumReads(),

- GetWrites(), GetNumWrites());

+ OrderedSocketData data(

+ GetReads(), GetNumReads(), GetWrites(), GetNumWrites());

MockConnect connect_data(SYNCHRONOUS, OK);

data.set_connect_data(connect_data);

@@ -259,9 +241,8 @@ TEST_P(SpdyStreamTest, StreamError) {

base::WeakPtr<SpdySession> session(CreateDefaultSpdySession());

- base::WeakPtr<SpdyStream> stream =

- CreateStreamSynchronously(

- SPDY_BIDIRECTIONAL_STREAM, session, url, LOWEST, log.bound());

+ base::WeakPtr<SpdyStream> stream = CreateStreamSynchronously(

+ SPDY_BIDIRECTIONAL_STREAM, session, url, LOWEST, log.bound());

ASSERT_TRUE(stream.get() != NULL);

StreamDelegateSendImmediate delegate(stream, kPostBodyStringPiece);

@@ -293,9 +274,7 @@ TEST_P(SpdyStreamTest, StreamError) {

// Check that we logged SPDY_STREAM_ERROR correctly.

int pos = net::ExpectLogContainsSomewhere(

- entries, 0,

- net::NetLog::TYPE_SPDY_STREAM_ERROR,

- net::NetLog::PHASE_NONE);

+ entries, 0, net::NetLog::TYPE_SPDY_STREAM_ERROR, net::NetLog::PHASE_NONE);

int stream_id2;

ASSERT_TRUE(entries[pos].GetIntegerValue("stream_id", &stream_id2));

@@ -310,21 +289,18 @@ TEST_P(SpdyStreamTest, SendLargeDataAfterOpenRequestResponse) {

session_ = SpdySessionDependencies::SpdyCreateSession(&session_deps_);

- scoped_ptr<SpdyFrame> req(

- spdy_util_.ConstructSpdyPost(

- kStreamUrl, 1, kPostBodyLength, LOWEST, NULL, 0));

+ scoped_ptr<SpdyFrame> req(spdy_util_.ConstructSpdyPost(

+ kStreamUrl, 1, kPostBodyLength, LOWEST, NULL, 0));

AddWrite(*req);

std::string chunk_data(kMaxSpdyFrameChunkSize, 'x');

- scoped_ptr<SpdyFrame> chunk(

- spdy_util_.ConstructSpdyBodyFrame(

- 1, chunk_data.data(), chunk_data.length(), false));

+ scoped_ptr<SpdyFrame> chunk(spdy_util_.ConstructSpdyBodyFrame(

+ 1, chunk_data.data(), chunk_data.length(), false));

AddWrite(*chunk);

- scoped_ptr<SpdyFrame> last_chunk(

- spdy_util_.ConstructSpdyBodyFrame(

- 1, chunk_data.data(), chunk_data.length(), true));

+ scoped_ptr<SpdyFrame> last_chunk(spdy_util_.ConstructSpdyBodyFrame(

+ 1, chunk_data.data(), chunk_data.length(), true));

AddWrite(*last_chunk);

scoped_ptr<SpdyFrame> resp(spdy_util_.ConstructSpdyPostSynReply(NULL, 0));

@@ -332,8 +308,8 @@ TEST_P(SpdyStreamTest, SendLargeDataAfterOpenRequestResponse) {

AddReadEOF();

- OrderedSocketData data(GetReads(), GetNumReads(),

- GetWrites(), GetNumWrites());

+ OrderedSocketData data(

+ GetReads(), GetNumReads(), GetWrites(), GetNumWrites());

MockConnect connect_data(SYNCHRONOUS, OK);

data.set_connect_data(connect_data);

@@ -341,9 +317,8 @@ TEST_P(SpdyStreamTest, SendLargeDataAfterOpenRequestResponse) {

base::WeakPtr<SpdySession> session(CreateDefaultSpdySession());

- base::WeakPtr<SpdyStream> stream =

- CreateStreamSynchronously(

- SPDY_REQUEST_RESPONSE_STREAM, session, url, LOWEST, BoundNetLog());

+ base::WeakPtr<SpdyStream> stream = CreateStreamSynchronously(

+ SPDY_REQUEST_RESPONSE_STREAM, session, url, LOWEST, BoundNetLog());

ASSERT_TRUE(stream.get() != NULL);

std::string body_data(3 * kMaxSpdyFrameChunkSize, 'x');

@@ -375,26 +350,24 @@ TEST_P(SpdyStreamTest, SendLargeDataAfterOpenBidirectional) {

session_ = SpdySessionDependencies::SpdyCreateSession(&session_deps_);

- scoped_ptr<SpdyFrame> req(

- spdy_util_.ConstructSpdyPost(

- kStreamUrl, 1, kPostBodyLength, LOWEST, NULL, 0));

+ scoped_ptr<SpdyFrame> req(spdy_util_.ConstructSpdyPost(

+ kStreamUrl, 1, kPostBodyLength, LOWEST, NULL, 0));

AddWrite(*req);

scoped_ptr<SpdyFrame> resp(spdy_util_.ConstructSpdyPostSynReply(NULL, 0));

AddRead(*resp);

std::string chunk_data(kMaxSpdyFrameChunkSize, 'x');

- scoped_ptr<SpdyFrame> chunk(

- spdy_util_.ConstructSpdyBodyFrame(

- 1, chunk_data.data(), chunk_data.length(), false));

+ scoped_ptr<SpdyFrame> chunk(spdy_util_.ConstructSpdyBodyFrame(

+ 1, chunk_data.data(), chunk_data.length(), false));

AddWrite(*chunk);

AddReadEOF();

- OrderedSocketData data(GetReads(), GetNumReads(),

- GetWrites(), GetNumWrites());

+ OrderedSocketData data(

+ GetReads(), GetNumReads(), GetWrites(), GetNumWrites());

MockConnect connect_data(SYNCHRONOUS, OK);

data.set_connect_data(connect_data);

@@ -402,9 +375,8 @@ TEST_P(SpdyStreamTest, SendLargeDataAfterOpenBidirectional) {

base::WeakPtr<SpdySession> session(CreateDefaultSpdySession());

- base::WeakPtr<SpdyStream> stream =

- CreateStreamSynchronously(

- SPDY_BIDIRECTIONAL_STREAM, session, url, LOWEST, BoundNetLog());

+ base::WeakPtr<SpdyStream> stream = CreateStreamSynchronously(

+ SPDY_BIDIRECTIONAL_STREAM, session, url, LOWEST, BoundNetLog());

ASSERT_TRUE(stream.get() != NULL);

std::string body_data(3 * kMaxSpdyFrameChunkSize, 'x');

@@ -441,8 +413,8 @@ TEST_P(SpdyStreamTest, UpperCaseHeaders) {

AddWrite(*syn);

const char* const kExtraHeaders[] = {"X-UpperCase", "yes"};

- scoped_ptr<SpdyFrame>

- reply(spdy_util_.ConstructSpdyGetSynReply(kExtraHeaders, 1, 1));

+ scoped_ptr<SpdyFrame> reply(

+ spdy_util_.ConstructSpdyGetSynReply(kExtraHeaders, 1, 1));

AddRead(*reply);

scoped_ptr<SpdyFrame> rst(

@@ -451,8 +423,8 @@ TEST_P(SpdyStreamTest, UpperCaseHeaders) {

AddReadEOF();

- DeterministicSocketData data(GetReads(), GetNumReads(),

- GetWrites(), GetNumWrites());

+ DeterministicSocketData data(

+ GetReads(), GetNumReads(), GetWrites(), GetNumWrites());

MockConnect connect_data(SYNCHRONOUS, OK);

data.set_connect_data(connect_data);

@@ -460,9 +432,8 @@ TEST_P(SpdyStreamTest, UpperCaseHeaders) {

base::WeakPtr<SpdySession> session(CreateDefaultSpdySession());

- base::WeakPtr<SpdyStream> stream =

- CreateStreamSynchronously(

- SPDY_REQUEST_RESPONSE_STREAM, session, url, LOWEST, BoundNetLog());

+ base::WeakPtr<SpdyStream> stream = CreateStreamSynchronously(

+ SPDY_REQUEST_RESPONSE_STREAM, session, url, LOWEST, BoundNetLog());

ASSERT_TRUE(stream.get() != NULL);

StreamDelegateDoNothing delegate(stream);

@@ -494,13 +465,12 @@ TEST_P(SpdyStreamTest, UpperCaseHeadersOnPush) {

spdy_util_.ConstructSpdyGet(NULL, 0, false, 1, LOWEST, true));

AddWrite(*syn);

- scoped_ptr<SpdyFrame>

- reply(spdy_util_.ConstructSpdyGetSynReply(NULL, 0, 1));

+ scoped_ptr<SpdyFrame> reply(spdy_util_.ConstructSpdyGetSynReply(NULL, 0, 1));

AddRead(*reply);

const char* const extra_headers[] = {"X-UpperCase", "yes"};

- scoped_ptr<SpdyFrame>

- push(spdy_util_.ConstructSpdyPush(extra_headers, 1, 2, 1, kStreamUrl));

+ scoped_ptr<SpdyFrame> push(

+ spdy_util_.ConstructSpdyPush(extra_headers, 1, 2, 1, kStreamUrl));

AddRead(*push);

scoped_ptr<SpdyFrame> rst(

@@ -509,8 +479,8 @@ TEST_P(SpdyStreamTest, UpperCaseHeadersOnPush) {

AddReadEOF();

- DeterministicSocketData data(GetReads(), GetNumReads(),

- GetWrites(), GetNumWrites());

+ DeterministicSocketData data(

+ GetReads(), GetNumReads(), GetWrites(), GetNumWrites());

MockConnect connect_data(SYNCHRONOUS, OK);

data.set_connect_data(connect_data);

@@ -518,9 +488,8 @@ TEST_P(SpdyStreamTest, UpperCaseHeadersOnPush) {

base::WeakPtr<SpdySession> session(CreateDefaultSpdySession());

- base::WeakPtr<SpdyStream> stream =

- CreateStreamSynchronously(

- SPDY_REQUEST_RESPONSE_STREAM, session, url, LOWEST, BoundNetLog());

+ base::WeakPtr<SpdyStream> stream = CreateStreamSynchronously(

+ SPDY_REQUEST_RESPONSE_STREAM, session, url, LOWEST, BoundNetLog());

ASSERT_TRUE(stream.get() != NULL);

StreamDelegateDoNothing delegate(stream);

@@ -558,24 +527,17 @@ TEST_P(SpdyStreamTest, UpperCaseHeadersInHeadersFrame) {

spdy_util_.ConstructSpdyGet(NULL, 0, false, 1, LOWEST, true));

AddWrite(*syn);

- scoped_ptr<SpdyFrame>

- reply(spdy_util_.ConstructSpdyGetSynReply(NULL, 0, 1));

+ scoped_ptr<SpdyFrame> reply(spdy_util_.ConstructSpdyGetSynReply(NULL, 0, 1));

AddRead(*reply);

- scoped_ptr<SpdyFrame>

- push(spdy_util_.ConstructSpdyPush(NULL, 0, 2, 1, kStreamUrl));

+ scoped_ptr<SpdyFrame> push(

+ spdy_util_.ConstructSpdyPush(NULL, 0, 2, 1, kStreamUrl));

AddRead(*push);

scoped_ptr<SpdyHeaderBlock> late_headers(new SpdyHeaderBlock());

(*late_headers)["X-UpperCase"] = "yes";

- scoped_ptr<SpdyFrame> headers_frame(

- spdy_util_.ConstructSpdyControlFrame(late_headers.Pass(),

- false,

- 2,

- LOWEST,

- HEADERS,

- CONTROL_FLAG_NONE,

- 0));

+ scoped_ptr<SpdyFrame> headers_frame(spdy_util_.ConstructSpdyControlFrame(

+ late_headers.Pass(), false, 2, LOWEST, HEADERS, CONTROL_FLAG_NONE, 0));

AddRead(*headers_frame);

scoped_ptr<SpdyFrame> rst(

@@ -584,8 +546,8 @@ TEST_P(SpdyStreamTest, UpperCaseHeadersInHeadersFrame) {

AddReadEOF();

- DeterministicSocketData data(GetReads(), GetNumReads(),

- GetWrites(), GetNumWrites());

+ DeterministicSocketData data(

+ GetReads(), GetNumReads(), GetWrites(), GetNumWrites());

MockConnect connect_data(SYNCHRONOUS, OK);

data.set_connect_data(connect_data);

@@ -593,9 +555,8 @@ TEST_P(SpdyStreamTest, UpperCaseHeadersInHeadersFrame) {

base::WeakPtr<SpdySession> session(CreateDefaultSpdySession());

- base::WeakPtr<SpdyStream> stream =

- CreateStreamSynchronously(

- SPDY_REQUEST_RESPONSE_STREAM, session, url, LOWEST, BoundNetLog());

+ base::WeakPtr<SpdyStream> stream = CreateStreamSynchronously(

+ SPDY_REQUEST_RESPONSE_STREAM, session, url, LOWEST, BoundNetLog());

ASSERT_TRUE(stream.get() != NULL);

StreamDelegateDoNothing delegate(stream);

@@ -638,24 +599,17 @@ TEST_P(SpdyStreamTest, DuplicateHeaders) {

spdy_util_.ConstructSpdyGet(NULL, 0, false, 1, LOWEST, true));

AddWrite(*syn);

- scoped_ptr<SpdyFrame>

- reply(spdy_util_.ConstructSpdyGetSynReply(NULL, 0, 1));

+ scoped_ptr<SpdyFrame> reply(spdy_util_.ConstructSpdyGetSynReply(NULL, 0, 1));

AddRead(*reply);

- scoped_ptr<SpdyFrame>

- push(spdy_util_.ConstructSpdyPush(NULL, 0, 2, 1, kStreamUrl));

+ scoped_ptr<SpdyFrame> push(

+ spdy_util_.ConstructSpdyPush(NULL, 0, 2, 1, kStreamUrl));

AddRead(*push);

scoped_ptr<SpdyHeaderBlock> late_headers(new SpdyHeaderBlock());

(*late_headers)[spdy_util_.GetStatusKey()] = "500 Server Error";

- scoped_ptr<SpdyFrame> headers_frame(

- spdy_util_.ConstructSpdyControlFrame(late_headers.Pass(),

- false,

- 2,

- LOWEST,

- HEADERS,

- CONTROL_FLAG_NONE,

- 0));

+ scoped_ptr<SpdyFrame> headers_frame(spdy_util_.ConstructSpdyControlFrame(

+ late_headers.Pass(), false, 2, LOWEST, HEADERS, CONTROL_FLAG_NONE, 0));

AddRead(*headers_frame);

scoped_ptr<SpdyFrame> rst(

@@ -664,8 +618,8 @@ TEST_P(SpdyStreamTest, DuplicateHeaders) {

AddReadEOF();

- DeterministicSocketData data(GetReads(), GetNumReads(),

- GetWrites(), GetNumWrites());

+ DeterministicSocketData data(

+ GetReads(), GetNumReads(), GetWrites(), GetNumWrites());

MockConnect connect_data(SYNCHRONOUS, OK);

data.set_connect_data(connect_data);

@@ -673,9 +627,8 @@ TEST_P(SpdyStreamTest, DuplicateHeaders) {

base::WeakPtr<SpdySession> session(CreateDefaultSpdySession());

- base::WeakPtr<SpdyStream> stream =

- CreateStreamSynchronously(

- SPDY_REQUEST_RESPONSE_STREAM, session, url, LOWEST, BoundNetLog());

+ base::WeakPtr<SpdyStream> stream = CreateStreamSynchronously(

+ SPDY_REQUEST_RESPONSE_STREAM, session, url, LOWEST, BoundNetLog());

ASSERT_TRUE(stream.get() != NULL);

StreamDelegateDoNothing delegate(stream);

@@ -718,9 +671,8 @@ TEST_P(SpdyStreamTest, IncreaseSendWindowSizeOverflow) {

session_ =

SpdySessionDependencies::SpdyCreateSessionDeterministic(&session_deps_);

- scoped_ptr<SpdyFrame> req(

- spdy_util_.ConstructSpdyPost(

- kStreamUrl, 1, kPostBodyLength, LOWEST, NULL, 0));

+ scoped_ptr<SpdyFrame> req(spdy_util_.ConstructSpdyPost(

+ kStreamUrl, 1, kPostBodyLength, LOWEST, NULL, 0));

AddWrite(*req);

// Triggered by the overflowing call to IncreaseSendWindowSize

@@ -733,8 +685,8 @@ TEST_P(SpdyStreamTest, IncreaseSendWindowSizeOverflow) {

CapturingBoundNetLog log;

- DeterministicSocketData data(GetReads(), GetNumReads(),

- GetWrites(), GetNumWrites());

+ DeterministicSocketData data(

+ GetReads(), GetNumReads(), GetWrites(), GetNumWrites());

MockConnect connect_data(SYNCHRONOUS, OK);

data.set_connect_data(connect_data);

@@ -743,9 +695,8 @@ TEST_P(SpdyStreamTest, IncreaseSendWindowSizeOverflow) {

base::WeakPtr<SpdySession> session(CreateDefaultSpdySession());

GURL url(kStreamUrl);

- base::WeakPtr<SpdyStream> stream =

- CreateStreamSynchronously(

- SPDY_BIDIRECTIONAL_STREAM, session, url, LOWEST, log.bound());

+ base::WeakPtr<SpdyStream> stream = CreateStreamSynchronously(

+ SPDY_BIDIRECTIONAL_STREAM, session, url, LOWEST, log.bound());

ASSERT_TRUE(stream.get() != NULL);

StreamDelegateSendImmediate delegate(stream, kPostBodyStringPiece);

stream->SetDelegate(&delegate);

@@ -810,9 +761,8 @@ void SpdyStreamTest::RunResumeAfterUnstallRequestResponseTest(

session_ =

SpdySessionDependencies::SpdyCreateSessionDeterministic(&session_deps_);

- scoped_ptr<SpdyFrame> req(

- spdy_util_.ConstructSpdyPost(

- kStreamUrl, 1, kPostBodyLength, LOWEST, NULL, 0));

+ scoped_ptr<SpdyFrame> req(spdy_util_.ConstructSpdyPost(

+ kStreamUrl, 1, kPostBodyLength, LOWEST, NULL, 0));

AddWrite(*req);

scoped_ptr<SpdyFrame> body(

@@ -824,8 +774,8 @@ void SpdyStreamTest::RunResumeAfterUnstallRequestResponseTest(

AddReadEOF();

- DeterministicSocketData data(GetReads(), GetNumReads(),

- GetWrites(), GetNumWrites());

+ DeterministicSocketData data(

+ GetReads(), GetNumReads(), GetWrites(), GetNumWrites());

MockConnect connect_data(SYNCHRONOUS, OK);

data.set_connect_data(connect_data);

@@ -833,9 +783,8 @@ void SpdyStreamTest::RunResumeAfterUnstallRequestResponseTest(

base::WeakPtr<SpdySession> session(CreateDefaultSpdySession());

- base::WeakPtr<SpdyStream> stream =

- CreateStreamSynchronously(

- SPDY_REQUEST_RESPONSE_STREAM, session, url, LOWEST, BoundNetLog());

+ base::WeakPtr<SpdyStream> stream = CreateStreamSynchronously(

+ SPDY_REQUEST_RESPONSE_STREAM, session, url, LOWEST, BoundNetLog());

ASSERT_TRUE(stream.get() != NULL);

StreamDelegateWithBody delegate(stream, kPostBodyStringPiece);

@@ -897,9 +846,8 @@ void SpdyStreamTest::RunResumeAfterUnstallBidirectionalTest(

session_ =

SpdySessionDependencies::SpdyCreateSessionDeterministic(&session_deps_);

- scoped_ptr<SpdyFrame> req(

- spdy_util_.ConstructSpdyPost(

- kStreamUrl, 1, kPostBodyLength, LOWEST, NULL, 0));

+ scoped_ptr<SpdyFrame> req(spdy_util_.ConstructSpdyPost(

+ kStreamUrl, 1, kPostBodyLength, LOWEST, NULL, 0));

AddWrite(*req);

scoped_ptr<SpdyFrame> resp(spdy_util_.ConstructSpdyGetSynReply(NULL, 0, 1));

@@ -915,8 +863,8 @@ void SpdyStreamTest::RunResumeAfterUnstallBidirectionalTest(

AddReadEOF();

- DeterministicSocketData data(GetReads(), GetNumReads(),

- GetWrites(), GetNumWrites());

+ DeterministicSocketData data(

+ GetReads(), GetNumReads(), GetWrites(), GetNumWrites());

MockConnect connect_data(SYNCHRONOUS, OK);

data.set_connect_data(connect_data);

@@ -924,9 +872,8 @@ void SpdyStreamTest::RunResumeAfterUnstallBidirectionalTest(

base::WeakPtr<SpdySession> session(CreateDefaultSpdySession());

- base::WeakPtr<SpdyStream> stream =

- CreateStreamSynchronously(

- SPDY_BIDIRECTIONAL_STREAM, session, url, LOWEST, BoundNetLog());

+ base::WeakPtr<SpdyStream> stream = CreateStreamSynchronously(

+ SPDY_BIDIRECTIONAL_STREAM, session, url, LOWEST, BoundNetLog());

ASSERT_TRUE(stream.get() != NULL);

StreamDelegateSendImmediate delegate(stream, kPostBodyStringPiece);

@@ -993,8 +940,7 @@ TEST_P(SpdyStreamTest, ReceivedBytes) {

spdy_util_.ConstructSpdyGet(NULL, 0, false, 1, LOWEST, true));

AddWrite(*syn);

- scoped_ptr<SpdyFrame>

- reply(spdy_util_.ConstructSpdyGetSynReply(NULL, 0, 1));

+ scoped_ptr<SpdyFrame> reply(spdy_util_.ConstructSpdyGetSynReply(NULL, 0, 1));

AddRead(*reply);

scoped_ptr<SpdyFrame> msg(

@@ -1003,8 +949,8 @@ TEST_P(SpdyStreamTest, ReceivedBytes) {

AddReadEOF();

- DeterministicSocketData data(GetReads(), GetNumReads(),

- GetWrites(), GetNumWrites());

+ DeterministicSocketData data(

+ GetReads(), GetNumReads(), GetWrites(), GetNumWrites());

MockConnect connect_data(SYNCHRONOUS, OK);

data.set_connect_data(connect_data);

@@ -1012,9 +958,8 @@ TEST_P(SpdyStreamTest, ReceivedBytes) {

base::WeakPtr<SpdySession> session(CreateDefaultSpdySession());

- base::WeakPtr<SpdyStream> stream =

- CreateStreamSynchronously(

- SPDY_REQUEST_RESPONSE_STREAM, session, url, LOWEST, BoundNetLog());

+ base::WeakPtr<SpdyStream> stream = CreateStreamSynchronously(

+ SPDY_REQUEST_RESPONSE_STREAM, session, url, LOWEST, BoundNetLog());

ASSERT_TRUE(stream.get() != NULL);

StreamDelegateDoNothing delegate(stream);

@@ -1030,19 +975,19 @@ TEST_P(SpdyStreamTest, ReceivedBytes) {

EXPECT_EQ(kStreamUrl, stream->GetUrlFromHeaders().spec());

int64 reply_frame_len = reply->size();

- int64 data_header_len = spdy_util_.CreateFramer(false)

- ->GetDataFrameMinimumSize();

+ int64 data_header_len =

+ spdy_util_.CreateFramer(false)->GetDataFrameMinimumSize();

int64 data_frame_len = data_header_len + kPostBodyLength;

int64 response_len = reply_frame_len + data_frame_len;

EXPECT_EQ(0, stream->raw_received_bytes());

- data.RunFor(1); // SYN

+ data.RunFor(1); // SYN

EXPECT_EQ(0, stream->raw_received_bytes());

- data.RunFor(1); // REPLY

+ data.RunFor(1); // REPLY

EXPECT_EQ(reply_frame_len, stream->raw_received_bytes());

- data.RunFor(1); // DATA

+ data.RunFor(1); // DATA

EXPECT_EQ(response_len, stream->raw_received_bytes());

- data.RunFor(1); // FIN

+ data.RunFor(1); // FIN

EXPECT_EQ(ERR_CONNECTION_CLOSED, delegate.WaitForClose());

}

« net/base/mime_util_unittest.cc ('K') | « net/spdy/spdy_stream_test_util.cc ('k') | net/spdy/spdy_test_util_common.h » ('j') | no next file with comments »