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

Unified Diff: net/spdy/chromium/spdy_session_unittest.cc

Issue 2936663002: Simplify CombineFrames() interface. (Closed)
Patch Set: Re: #7. Created 3 years, 6 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
« no previous file with comments | « net/spdy/chromium/spdy_network_transaction_unittest.cc ('k') | net/spdy/chromium/spdy_test_util_common.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 70333541069f0b2329f77a6e748ddffa1deeaba6..4b6013286847c4c97038bbd7c15a6170bb10460d 100644
--- a/net/spdy/chromium/spdy_session_unittest.cc
+++ b/net/spdy/chromium/spdy_session_unittest.cc
@@ -5516,12 +5516,10 @@ class SendInitialSettingsOnNewSpdySessionTest : public SpdySessionTest {
/* owns_buffer = */ false);
SpdySerializedFrame settings_frame(
spdy_util_.ConstructSpdySettings(expected_settings));
- 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)};
+
+ SpdySerializedFrame combined_frame =
+ CombineFrames({&preface, &settings_frame});
+ MockWrite writes[] = {CreateMockWrite(combined_frame, 0)};
StaticSocketDataProvider data(reads, arraysize(reads), writes,
arraysize(writes));
« no previous file with comments | « net/spdy/chromium/spdy_network_transaction_unittest.cc ('k') | net/spdy/chromium/spdy_test_util_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698