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

Unified Diff: net/spdy/spdy_websocket_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_websocket_stream_unittest.cc

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

index 04e5635c8c486b8dc410d1775bc8929baae8da39..8fc3ee5baea0bc186eabe0bdedab4db0bd55cdfe 100644

--- a/net/spdy/spdy_websocket_stream_unittest.cc

+++ b/net/spdy/spdy_websocket_stream_unittest.cc

@@ -36,10 +36,7 @@ struct SpdyWebSocketStreamEvent {

const SpdyHeaderBlock& headers,

int result,

const std::string& data)

- : event_type(type),

- headers(headers),

- result(result),

- data(data) {}

+ : event_type(type), headers(headers), result(result), data(data) {}

EventType event_type;

SpdyHeaderBlock headers;

@@ -70,9 +67,7 @@ class SpdyWebSocketStreamEventRecorder : public SpdyWebSocketStream::Delegate {

void SetOnReceivedData(const StreamEventCallback& callback) {

on_received_data_ = callback;

}

- void SetOnClose(const StreamEventCallback& callback) {

- on_close_ = callback;

- }

+ void SetOnClose(const StreamEventCallback& callback) { on_close_ = callback; }

virtual void OnCreatedSpdyStream(int result) OVERRIDE {

events_.push_back(

@@ -94,22 +89,20 @@ class SpdyWebSocketStreamEventRecorder : public SpdyWebSocketStream::Delegate {

}

virtual void OnSpdyResponseHeadersUpdated(

const SpdyHeaderBlock& response_headers) OVERRIDE {

- events_.push_back(

- SpdyWebSocketStreamEvent(

- SpdyWebSocketStreamEvent::EVENT_RECEIVED_HEADER,

- response_headers,

- OK,

- std::string()));

+ events_.push_back(SpdyWebSocketStreamEvent(

+ SpdyWebSocketStreamEvent::EVENT_RECEIVED_HEADER,

+ response_headers,

+ OK,

+ std::string()));

if (!on_received_header_.is_null())

on_received_header_.Run(&events_.back());

}

virtual void OnSentSpdyData(size_t bytes_sent) OVERRIDE {

events_.push_back(

- SpdyWebSocketStreamEvent(

- SpdyWebSocketStreamEvent::EVENT_SENT_DATA,

- SpdyHeaderBlock(),

- static_cast<int>(bytes_sent),

- std::string()));

+ SpdyWebSocketStreamEvent(SpdyWebSocketStreamEvent::EVENT_SENT_DATA,

+ SpdyHeaderBlock(),

+ static_cast<int>(bytes_sent),

+ std::string()));

if (!on_sent_data_.is_null())

on_sent_data_.Run(&events_.back());

}

@@ -121,21 +114,19 @@ class SpdyWebSocketStreamEventRecorder : public SpdyWebSocketStream::Delegate {

buffer_data.append(buffer->GetRemainingData(), buffer_len);

}

events_.push_back(

- SpdyWebSocketStreamEvent(

- SpdyWebSocketStreamEvent::EVENT_RECEIVED_DATA,

- SpdyHeaderBlock(),

- buffer_len,

- buffer_data));

+ SpdyWebSocketStreamEvent(SpdyWebSocketStreamEvent::EVENT_RECEIVED_DATA,

+ SpdyHeaderBlock(),

+ buffer_len,

+ buffer_data));

if (!on_received_data_.is_null())

on_received_data_.Run(&events_.back());

}

virtual void OnCloseSpdyStream() OVERRIDE {

events_.push_back(

- SpdyWebSocketStreamEvent(

- SpdyWebSocketStreamEvent::EVENT_CLOSE,

- SpdyHeaderBlock(),

- OK,

- std::string()));

+ SpdyWebSocketStreamEvent(SpdyWebSocketStreamEvent::EVENT_CLOSE,

+ SpdyHeaderBlock(),

+ OK,

+ std::string()));

if (!on_close_.is_null())

on_close_.Run(&events_.back());

if (!callback_.is_null())

@@ -177,9 +168,7 @@ class SpdyWebSocketStreamTest

websocket_stream_->SendData(kClosingFrame, kClosingFrameLength);

}

- void DoClose(SpdyWebSocketStreamEvent* event) {

- websocket_stream_->Close();

- }

+ void DoClose(SpdyWebSocketStreamEvent* event) { websocket_stream_->Close(); }

void DoSync(SpdyWebSocketStreamEvent* event) {

sync_callback_.callback().Run(OK);

@@ -199,54 +188,40 @@ class SpdyWebSocketStreamTest

virtual void SetUp() {

host_port_pair_.set_host("example.com");

host_port_pair_.set_port(80);

- spdy_session_key_ = SpdySessionKey(host_port_pair_,

- ProxyServer::Direct(),

- PRIVACY_MODE_DISABLED);

+ spdy_session_key_ = SpdySessionKey(

+ host_port_pair_, ProxyServer::Direct(), PRIVACY_MODE_DISABLED);

- spdy_settings_to_send_[spdy_settings_id_to_set_] =

- SettingsFlagsAndValue(

- SETTINGS_FLAG_PERSISTED, spdy_settings_value_to_set_);

+ spdy_settings_to_send_[spdy_settings_id_to_set_] = SettingsFlagsAndValue(

+ SETTINGS_FLAG_PERSISTED, spdy_settings_value_to_set_);

}

- virtual void TearDown() {

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

- }

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

void Prepare(SpdyStreamId stream_id) {

stream_id_ = stream_id;

request_frame_.reset(spdy_util_.ConstructSpdyWebSocketSynStream(

- stream_id_,

- "/echo",

- "example.com",

- "http://example.com/wsdemo"));

+ stream_id_, "/echo", "example.com", "http://example.com/wsdemo"));

response_frame_.reset(

spdy_util_.ConstructSpdyWebSocketSynReply(stream_id_));

message_frame_.reset(spdy_util_.ConstructSpdyWebSocketDataFrame(

- kMessageFrame,

- kMessageFrameLength,

- stream_id_,

- false));

+ kMessageFrame, kMessageFrameLength, stream_id_, false));

closing_frame_.reset(spdy_util_.ConstructSpdyWebSocketDataFrame(

- kClosingFrame,

- kClosingFrameLength,

- stream_id_,

- false));

+ kClosingFrame, kClosingFrameLength, stream_id_, false));

closing_frame_fin_.reset(spdy_util_.ConstructSpdyWebSocketDataFrame(

- kClosingFrame,

- kClosingFrameLength,

- stream_id_,

- true));

+ kClosingFrame, kClosingFrameLength, stream_id_, true));

}

- void InitSession(MockRead* reads, size_t reads_count,

- MockWrite* writes, size_t writes_count) {

- data_.reset(new OrderedSocketData(reads, reads_count,

- writes, writes_count));

+ void InitSession(MockRead* reads,

+ size_t reads_count,

+ MockWrite* writes,

+ size_t writes_count) {

+ data_.reset(

+ new OrderedSocketData(reads, reads_count, writes, writes_count));

session_deps_.socket_factory->AddSocketDataProvider(data_.get());

http_session_ = SpdySessionDependencies::SpdyCreateSession(&session_deps_);

session_ = CreateInsecureSpdySession(

@@ -291,11 +266,12 @@ class SpdyWebSocketStreamTest

static const size_t kClosingFrameLength;

};

-INSTANTIATE_TEST_CASE_P(

- NextProto,

- SpdyWebSocketStreamTest,

- testing::Values(kProtoDeprecatedSPDY2,

- kProtoSPDY3, kProtoSPDY31, kProtoSPDY4));

+INSTANTIATE_TEST_CASE_P(NextProto,

+ SpdyWebSocketStreamTest,

+ testing::Values(kProtoDeprecatedSPDY2,

+ kProtoSPDY3,

+ kProtoSPDY31,

+ kProtoSPDY4));

// TODO(toyoshim): Replace old framing data to new one, then use HEADERS and

// data frames.

@@ -308,29 +284,25 @@ const size_t SpdyWebSocketStreamTest::kClosingFrameLength =

TEST_P(SpdyWebSocketStreamTest, Basic) {

Prepare(1);

- MockWrite writes[] = {

- CreateMockWrite(*request_frame_.get(), 1),

- CreateMockWrite(*message_frame_.get(), 3),

- CreateMockWrite(*closing_frame_.get(), 5)

- };

+ MockWrite writes[] = {CreateMockWrite(*request_frame_.get(), 1),

+ CreateMockWrite(*message_frame_.get(), 3),

+ CreateMockWrite(*closing_frame_.get(), 5)};

MockRead reads[] = {

- CreateMockRead(*response_frame_.get(), 2),

- CreateMockRead(*message_frame_.get(), 4),

- // Skip sequence 6 to notify closing has been sent.

- CreateMockRead(*closing_frame_.get(), 7),

- MockRead(SYNCHRONOUS, 0, 8) // EOF cause OnCloseSpdyStream event.

+ CreateMockRead(*response_frame_.get(), 2),

+ CreateMockRead(*message_frame_.get(), 4),

+ // Skip sequence 6 to notify closing has been sent.

+ CreateMockRead(*closing_frame_.get(), 7),

+ MockRead(SYNCHRONOUS, 0, 8) // EOF cause OnCloseSpdyStream event.

};

InitSession(reads, arraysize(reads), writes, arraysize(writes));

SpdyWebSocketStreamEventRecorder delegate(completion_callback_.callback());

- delegate.SetOnReceivedHeader(

- base::Bind(&SpdyWebSocketStreamTest::DoSendHelloFrame,

- base::Unretained(this)));

- delegate.SetOnReceivedData(

- base::Bind(&SpdyWebSocketStreamTest::DoSendClosingFrame,

- base::Unretained(this)));

+ delegate.SetOnReceivedHeader(base::Bind(

+ &SpdyWebSocketStreamTest::DoSendHelloFrame, base::Unretained(this)));

+ delegate.SetOnReceivedData(base::Bind(

+ &SpdyWebSocketStreamTest::DoSendClosingFrame, base::Unretained(this)));

websocket_stream_.reset(new SpdyWebSocketStream(session_, &delegate));

@@ -352,26 +324,22 @@ TEST_P(SpdyWebSocketStreamTest, Basic) {

delegate.GetSeenEvents();

ASSERT_EQ(7U, events.size());

- EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_SENT_HEADERS,

- events[0].event_type);

+ EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_SENT_HEADERS, events[0].event_type);

EXPECT_EQ(OK, events[0].result);

EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_RECEIVED_HEADER,

events[1].event_type);

EXPECT_EQ(OK, events[1].result);

- EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_SENT_DATA,

- events[2].event_type);

+ EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_SENT_DATA, events[2].event_type);

EXPECT_EQ(static_cast<int>(kMessageFrameLength), events[2].result);

EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_RECEIVED_DATA,

events[3].event_type);

EXPECT_EQ(static_cast<int>(kMessageFrameLength), events[3].result);

- EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_SENT_DATA,

- events[4].event_type);

+ EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_SENT_DATA, events[4].event_type);

EXPECT_EQ(static_cast<int>(kClosingFrameLength), events[4].result);

EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_RECEIVED_DATA,

events[5].event_type);

EXPECT_EQ(static_cast<int>(kClosingFrameLength), events[5].result);

- EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_CLOSE,

- events[6].event_type);

+ EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_CLOSE, events[6].event_type);

EXPECT_EQ(OK, events[6].result);

// EOF close SPDY session.

@@ -386,20 +354,19 @@ TEST_P(SpdyWebSocketStreamTest, Basic) {

TEST_P(SpdyWebSocketStreamTest, RemoteCloseWithFin) {

Prepare(1);

MockWrite writes[] = {

- CreateMockWrite(*request_frame_.get(), 1),

- CreateMockWrite(*closing_frame_.get(), 4),

+ CreateMockWrite(*request_frame_.get(), 1),

+ CreateMockWrite(*closing_frame_.get(), 4),

};

MockRead reads[] = {

- CreateMockRead(*response_frame_.get(), 2),

- CreateMockRead(*closing_frame_fin_.get(), 3),

- MockRead(SYNCHRONOUS, 0, 5) // EOF cause OnCloseSpdyStream event.

+ CreateMockRead(*response_frame_.get(), 2),

+ CreateMockRead(*closing_frame_fin_.get(), 3),

+ MockRead(SYNCHRONOUS, 0, 5) // EOF cause OnCloseSpdyStream event.

};

InitSession(reads, arraysize(reads), writes, arraysize(writes));

SpdyWebSocketStreamEventRecorder delegate(completion_callback_.callback());

- delegate.SetOnReceivedData(

- base::Bind(&SpdyWebSocketStreamTest::DoSendClosingFrame,

- base::Unretained(this)));

+ delegate.SetOnReceivedData(base::Bind(

+ &SpdyWebSocketStreamTest::DoSendClosingFrame, base::Unretained(this)));

websocket_stream_.reset(new SpdyWebSocketStream(session_, &delegate));

BoundNetLog net_log;

@@ -414,8 +381,7 @@ TEST_P(SpdyWebSocketStreamTest, RemoteCloseWithFin) {

delegate.GetSeenEvents();

EXPECT_EQ(5U, events.size());

- EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_SENT_HEADERS,

- events[0].event_type);

+ EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_SENT_HEADERS, events[0].event_type);

EXPECT_EQ(OK, events[0].result);

EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_RECEIVED_HEADER,

events[1].event_type);

@@ -423,11 +389,9 @@ TEST_P(SpdyWebSocketStreamTest, RemoteCloseWithFin) {

EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_RECEIVED_DATA,

events[2].event_type);

EXPECT_EQ(static_cast<int>(kClosingFrameLength), events[2].result);

- EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_SENT_DATA,

- events[3].event_type);

+ EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_SENT_DATA, events[3].event_type);

EXPECT_EQ(static_cast<int>(kClosingFrameLength), events[3].result);

- EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_CLOSE,

- events[4].event_type);

+ EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_CLOSE, events[4].event_type);

EXPECT_EQ(OK, events[4].result);

// EOF closes SPDY session.

@@ -439,26 +403,20 @@ TEST_P(SpdyWebSocketStreamTest, RemoteCloseWithFin) {

TEST_P(SpdyWebSocketStreamTest, DestructionBeforeClose) {

Prepare(1);

- MockWrite writes[] = {

- CreateMockWrite(*request_frame_.get(), 1),

- CreateMockWrite(*message_frame_.get(), 3)

- };

+ MockWrite writes[] = {CreateMockWrite(*request_frame_.get(), 1),

+ CreateMockWrite(*message_frame_.get(), 3)};

- MockRead reads[] = {

- CreateMockRead(*response_frame_.get(), 2),

- CreateMockRead(*message_frame_.get(), 4),

- MockRead(ASYNC, ERR_IO_PENDING, 5)

- };

+ MockRead reads[] = {CreateMockRead(*response_frame_.get(), 2),

+ CreateMockRead(*message_frame_.get(), 4),

+ MockRead(ASYNC, ERR_IO_PENDING, 5)};

InitSession(reads, arraysize(reads), writes, arraysize(writes));

SpdyWebSocketStreamEventRecorder delegate(completion_callback_.callback());

- delegate.SetOnReceivedHeader(

- base::Bind(&SpdyWebSocketStreamTest::DoSendHelloFrame,

- base::Unretained(this)));

+ delegate.SetOnReceivedHeader(base::Bind(

+ &SpdyWebSocketStreamTest::DoSendHelloFrame, base::Unretained(this)));

delegate.SetOnReceivedData(

- base::Bind(&SpdyWebSocketStreamTest::DoSync,

- base::Unretained(this)));

+ base::Bind(&SpdyWebSocketStreamTest::DoSync, base::Unretained(this)));

websocket_stream_.reset(new SpdyWebSocketStream(session_, &delegate));

@@ -479,14 +437,12 @@ TEST_P(SpdyWebSocketStreamTest, DestructionBeforeClose) {

delegate.GetSeenEvents();

ASSERT_GE(4U, events.size());

- EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_SENT_HEADERS,

- events[0].event_type);

+ EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_SENT_HEADERS, events[0].event_type);

EXPECT_EQ(OK, events[0].result);

EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_RECEIVED_HEADER,

events[1].event_type);

EXPECT_EQ(OK, events[1].result);

- EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_SENT_DATA,

- events[2].event_type);

+ EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_SENT_DATA, events[2].event_type);

EXPECT_EQ(static_cast<int>(kMessageFrameLength), events[2].result);

EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_RECEIVED_DATA,

events[3].event_type);

@@ -500,27 +456,21 @@ TEST_P(SpdyWebSocketStreamTest, DestructionBeforeClose) {

TEST_P(SpdyWebSocketStreamTest, DestructionAfterExplicitClose) {

Prepare(1);

- MockWrite writes[] = {

- CreateMockWrite(*request_frame_.get(), 1),

- CreateMockWrite(*message_frame_.get(), 3),

- CreateMockWrite(*closing_frame_.get(), 5)

- };

+ MockWrite writes[] = {CreateMockWrite(*request_frame_.get(), 1),

+ CreateMockWrite(*message_frame_.get(), 3),

+ CreateMockWrite(*closing_frame_.get(), 5)};

- MockRead reads[] = {

- CreateMockRead(*response_frame_.get(), 2),

- CreateMockRead(*message_frame_.get(), 4),

- MockRead(ASYNC, ERR_IO_PENDING, 6)

- };

+ MockRead reads[] = {CreateMockRead(*response_frame_.get(), 2),

+ CreateMockRead(*message_frame_.get(), 4),

+ MockRead(ASYNC, ERR_IO_PENDING, 6)};

InitSession(reads, arraysize(reads), writes, arraysize(writes));

SpdyWebSocketStreamEventRecorder delegate(completion_callback_.callback());

- delegate.SetOnReceivedHeader(

- base::Bind(&SpdyWebSocketStreamTest::DoSendHelloFrame,

- base::Unretained(this)));

+ delegate.SetOnReceivedHeader(base::Bind(

+ &SpdyWebSocketStreamTest::DoSendHelloFrame, base::Unretained(this)));

delegate.SetOnReceivedData(

- base::Bind(&SpdyWebSocketStreamTest::DoClose,

- base::Unretained(this)));

+ base::Bind(&SpdyWebSocketStreamTest::DoClose, base::Unretained(this)));

websocket_stream_.reset(new SpdyWebSocketStream(session_, &delegate));

@@ -540,14 +490,12 @@ TEST_P(SpdyWebSocketStreamTest, DestructionAfterExplicitClose) {

delegate.GetSeenEvents();

ASSERT_EQ(5U, events.size());

- EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_SENT_HEADERS,

- events[0].event_type);

+ EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_SENT_HEADERS, events[0].event_type);

EXPECT_EQ(OK, events[0].result);

EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_RECEIVED_HEADER,

events[1].event_type);

EXPECT_EQ(OK, events[1].result);

- EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_SENT_DATA,

- events[2].event_type);

+ EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_SENT_DATA, events[2].event_type);

EXPECT_EQ(static_cast<int>(kMessageFrameLength), events[2].result);

EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_RECEIVED_DATA,

events[3].event_type);

@@ -562,22 +510,20 @@ TEST_P(SpdyWebSocketStreamTest, IOPending) {

Prepare(1);

scoped_ptr<SpdyFrame> settings_frame(

spdy_util_.ConstructSpdySettings(spdy_settings_to_send_));

- MockWrite writes[] = {

- CreateMockWrite(*request_frame_.get(), 1),

- CreateMockWrite(*message_frame_.get(), 3),

- CreateMockWrite(*closing_frame_.get(), 5)

- };

+ MockWrite writes[] = {CreateMockWrite(*request_frame_.get(), 1),

+ CreateMockWrite(*message_frame_.get(), 3),

+ CreateMockWrite(*closing_frame_.get(), 5)};

MockRead reads[] = {

- CreateMockRead(*settings_frame.get(), 0),

- CreateMockRead(*response_frame_.get(), 2),

- CreateMockRead(*message_frame_.get(), 4),

- CreateMockRead(*closing_frame_.get(), 6),

- MockRead(SYNCHRONOUS, 0, 7) // EOF cause OnCloseSpdyStream event.

+ CreateMockRead(*settings_frame.get(), 0),

+ CreateMockRead(*response_frame_.get(), 2),

+ CreateMockRead(*message_frame_.get(), 4),

+ CreateMockRead(*closing_frame_.get(), 6),

+ MockRead(SYNCHRONOUS, 0, 7) // EOF cause OnCloseSpdyStream event.

};

- DeterministicSocketData data(reads, arraysize(reads),

- writes, arraysize(writes));

+ DeterministicSocketData data(

+ reads, arraysize(reads), writes, arraysize(writes));

session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data);

http_session_ =

SpdySessionDependencies::SpdyCreateSessionDeterministic(&session_deps_);

@@ -601,20 +547,17 @@ TEST_P(SpdyWebSocketStreamTest, IOPending) {

// Create a WebSocketStream under test.

SpdyWebSocketStreamEventRecorder delegate(completion_callback_.callback());

delegate.SetOnCreated(

- base::Bind(&SpdyWebSocketStreamTest::DoSync,

- base::Unretained(this)));

- delegate.SetOnReceivedHeader(

- base::Bind(&SpdyWebSocketStreamTest::DoSendHelloFrame,

- base::Unretained(this)));

- delegate.SetOnReceivedData(

- base::Bind(&SpdyWebSocketStreamTest::DoSendClosingFrame,

- base::Unretained(this)));

+ base::Bind(&SpdyWebSocketStreamTest::DoSync, base::Unretained(this)));

+ delegate.SetOnReceivedHeader(base::Bind(

+ &SpdyWebSocketStreamTest::DoSendHelloFrame, base::Unretained(this)));

+ delegate.SetOnReceivedData(base::Bind(

+ &SpdyWebSocketStreamTest::DoSendClosingFrame, base::Unretained(this)));

websocket_stream_.reset(new SpdyWebSocketStream(session_, &delegate));

BoundNetLog net_log;

GURL url("ws://example.com/echo");

- ASSERT_EQ(ERR_IO_PENDING, websocket_stream_->InitializeStream(

- url, HIGHEST, net_log));

+ ASSERT_EQ(ERR_IO_PENDING,

+ websocket_stream_->InitializeStream(url, HIGHEST, net_log));

// Delete the fist stream to allow create the second stream.

block_stream.reset();

@@ -634,29 +577,24 @@ TEST_P(SpdyWebSocketStreamTest, IOPending) {

const std::vector<SpdyWebSocketStreamEvent>& events =

delegate.GetSeenEvents();

ASSERT_EQ(8U, events.size());

- EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_CREATED,

- events[0].event_type);

+ EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_CREATED, events[0].event_type);

EXPECT_EQ(0, events[0].result);

- EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_SENT_HEADERS,

- events[1].event_type);

+ EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_SENT_HEADERS, events[1].event_type);

EXPECT_EQ(OK, events[1].result);

EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_RECEIVED_HEADER,

events[2].event_type);

EXPECT_EQ(OK, events[2].result);

- EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_SENT_DATA,

- events[3].event_type);

+ EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_SENT_DATA, events[3].event_type);

EXPECT_EQ(static_cast<int>(kMessageFrameLength), events[3].result);

EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_RECEIVED_DATA,

events[4].event_type);

EXPECT_EQ(static_cast<int>(kMessageFrameLength), events[4].result);

- EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_SENT_DATA,

- events[5].event_type);

+ EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_SENT_DATA, events[5].event_type);

EXPECT_EQ(static_cast<int>(kClosingFrameLength), events[5].result);

EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_RECEIVED_DATA,

events[6].event_type);

EXPECT_EQ(static_cast<int>(kClosingFrameLength), events[6].result);

- EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_CLOSE,

- events[7].event_type);

+ EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_CLOSE, events[7].event_type);

EXPECT_EQ(OK, events[7].result);

// EOF close SPDY session.

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