| Index: net/spdy/chromium/spdy_session_unittest.cc
|
| diff --git a/net/spdy/chromium/spdy_session_unittest.cc b/net/spdy/chromium/spdy_session_unittest.cc
|
| index ee9749bc983c0c70286836b9b208434390fb91a3..ce7b9dd5b20192b3f43a01d52c81ad7516bdb1ff 100644
|
| --- a/net/spdy/chromium/spdy_session_unittest.cc
|
| +++ b/net/spdy/chromium/spdy_session_unittest.cc
|
| @@ -5511,11 +5511,17 @@ class SendInitialSettingsOnNewSpdySessionTest : public SpdySessionTest {
|
|
|
| MockRead reads[] = {MockRead(SYNCHRONOUS, ERR_IO_PENDING)};
|
|
|
| + SpdySerializedFrame preface(const_cast<char*>(kHttp2ConnectionHeaderPrefix),
|
| + kHttp2ConnectionHeaderPrefixSize,
|
| + /* owns_buffer = */ false);
|
| SpdySerializedFrame settings_frame(
|
| spdy_util_.ConstructSpdySettings(expected_settings));
|
| - MockWrite writes[] = {MockWrite(ASYNC, kHttp2ConnectionHeaderPrefix,
|
| - kHttp2ConnectionHeaderPrefixSize),
|
| - CreateMockWrite(settings_frame)};
|
| + const SpdySerializedFrame* frames[2] = {&preface, &settings_frame};
|
| + char combined_frames[100];
|
| + int combined_frames_len = CombineFrames(
|
| + frames, arraysize(frames), combined_frames, arraysize(combined_frames));
|
| + MockWrite writes[] = {
|
| + MockWrite(ASYNC, combined_frames, combined_frames_len)};
|
|
|
| StaticSocketDataProvider data(reads, arraysize(reads), writes,
|
| arraysize(writes));
|
|
|