Simplify CombineFrames() interface.

net/spdy/chromium/spdy_network_transaction_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <cmath>
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 3588 matching lines @@
 TEST_F(SpdyNetworkTransactionTest, BufferFull) {
   SpdySerializedFrame req(
       spdy_util_.ConstructSpdyGet(nullptr, 0, 1, LOWEST, true));
   MockWrite writes[] = {CreateMockWrite(req, 0)};
 
   // 2 data frames in a single read.
   SpdySerializedFrame data_frame_1(
       spdy_util_.ConstructSpdyDataFrame(1, "goodby", 6, /*fin=*/false));
   SpdySerializedFrame data_frame_2(
       spdy_util_.ConstructSpdyDataFrame(1, "e worl", 6, /*fin=*/false));
-  const SpdySerializedFrame* data_frames[2] = {
-      &data_frame_1, &data_frame_2,
-  };
-  char combined_data_frames[100];
-  int combined_data_frames_len =
-      CombineFrames(data_frames, arraysize(data_frames),
-                    combined_data_frames, arraysize(combined_data_frames));
+  SpdySerializedFrame combined_data_frames =
+      CombineFrames({&data_frame_1, &data_frame_2});
+
   SpdySerializedFrame last_frame(
       spdy_util_.ConstructSpdyDataFrame(1, "d", 1, /*fin=*/true));
 
   SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
   MockRead reads[] = {
       CreateMockRead(resp, 1),
       MockRead(ASYNC, ERR_IO_PENDING, 2),  // Force a pause
-      MockRead(ASYNC, combined_data_frames, combined_data_frames_len, 3),
+      CreateMockRead(combined_data_frames, 3),
       MockRead(ASYNC, ERR_IO_PENDING, 4),  // Force a pause
       CreateMockRead(last_frame, 5),
       MockRead(ASYNC, 0, 6)  // EOF
   };
 
   SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
 
   TestCompletionCallback callback;
 
   NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
@@ skipping 55 matching lines @@
 TEST_F(SpdyNetworkTransactionTest, Buffering) {
   SpdySerializedFrame req(
       spdy_util_.ConstructSpdyGet(nullptr, 0, 1, LOWEST, true));
   MockWrite writes[] = {CreateMockWrite(req, 0)};
 
   // 4 data frames in a single read.
   SpdySerializedFrame data_frame(
       spdy_util_.ConstructSpdyDataFrame(1, "message", 7, /*fin=*/false));
   SpdySerializedFrame data_frame_fin(
       spdy_util_.ConstructSpdyDataFrame(1, "message", 7, /*fin=*/true));
-  const SpdySerializedFrame* data_frames[4] = {&data_frame, &data_frame,
-                                               &data_frame, &data_frame_fin};
-  char combined_data_frames[100];
-  int combined_data_frames_len =
-      CombineFrames(data_frames, arraysize(data_frames),
-                    combined_data_frames, arraysize(combined_data_frames));
+  SpdySerializedFrame combined_data_frames =
+      CombineFrames({&data_frame, &data_frame, &data_frame, &data_frame_fin});
 
   SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
   MockRead reads[] = {
       CreateMockRead(resp, 1),
       MockRead(ASYNC, ERR_IO_PENDING, 2),  // Force a pause
-      MockRead(ASYNC, combined_data_frames, combined_data_frames_len, 3),
-      MockRead(ASYNC, 0, 4)  // EOF
+      CreateMockRead(combined_data_frames, 3), MockRead(ASYNC, 0, 4)  // EOF
   };
 
   SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
 
   NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
                                      NetLogWithSource(), nullptr);
   helper.RunPreTestSetup();
   helper.AddData(&data);
   HttpNetworkTransaction* trans = helper.trans();
 
@@ skipping 56 matching lines @@
   SpdySerializedFrame req(
       spdy_util_.ConstructSpdyGet(nullptr, 0, 1, LOWEST, true));
   MockWrite writes[] = {CreateMockWrite(req, 0)};
 
   // 5 data frames in a single read.
   SpdySerializedFrame reply(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
   SpdySerializedFrame data_frame(
       spdy_util_.ConstructSpdyDataFrame(1, "message", 7, /*fin=*/false));
   SpdySerializedFrame data_frame_fin(
       spdy_util_.ConstructSpdyDataFrame(1, "message", 7, /*fin=*/true));
-  const SpdySerializedFrame* frames[5] = {&reply, &data_frame, &data_frame,
-                                          &data_frame, &data_frame_fin};
-  char combined_frames[200];
-  int combined_frames_len =
-      CombineFrames(frames, arraysize(frames),
-                    combined_frames, arraysize(combined_frames));
+  SpdySerializedFrame combined_frames = CombineFrames(
+      {&reply, &data_frame, &data_frame, &data_frame, &data_frame_fin});
 
   MockRead reads[] = {
-      MockRead(ASYNC, combined_frames, combined_frames_len, 1),
-      MockRead(ASYNC, 0, 2)  // EOF
+      CreateMockRead(combined_frames, 1), MockRead(ASYNC, 0, 2)  // EOF
   };
 
   SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
 
   NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
                                      NetLogWithSource(), nullptr);
   helper.RunPreTestSetup();
   helper.AddData(&data);
   HttpNetworkTransaction* trans = helper.trans();
 
@@ skipping 50 matching lines @@
 // Verify the case where we buffer data and close the connection.
 TEST_F(SpdyNetworkTransactionTest, BufferedClosed) {
   SpdySerializedFrame req(
       spdy_util_.ConstructSpdyGet(nullptr, 0, 1, LOWEST, true));
   MockWrite writes[] = {CreateMockWrite(req, 0)};
 
   // All data frames in a single read.
   // NOTE: We don't FIN the stream.
   SpdySerializedFrame data_frame(
       spdy_util_.ConstructSpdyDataFrame(1, "message", 7, /*fin=*/false));
-  const SpdySerializedFrame* data_frames[4] = {&data_frame, &data_frame,
-                                               &data_frame, &data_frame};
-  char combined_data_frames[100];
-  int combined_data_frames_len =
-      CombineFrames(data_frames, arraysize(data_frames),
-                    combined_data_frames, arraysize(combined_data_frames));
+  SpdySerializedFrame combined_data_frames =
+      CombineFrames({&data_frame, &data_frame, &data_frame, &data_frame});
   SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
   MockRead reads[] = {
       CreateMockRead(resp, 1),
       MockRead(ASYNC, ERR_IO_PENDING, 2),  // Force a wait
-      MockRead(ASYNC, combined_data_frames, combined_data_frames_len, 3),
-      MockRead(ASYNC, 0, 4)  // EOF
+      CreateMockRead(combined_data_frames, 3), MockRead(ASYNC, 0, 4)  // EOF
   };
 
   SequencedSocketData data(reads, arraysize(reads), writes, arraysize(writes));
 
   NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY,
                                      NetLogWithSource(), nullptr);
   helper.RunPreTestSetup();
   helper.AddData(&data);
   HttpNetworkTransaction* trans = helper.trans();
 
@@ skipping 1744 matching lines @@
       kSpdyMaxConcurrentPushedStreams;
   initial_settings[SETTINGS_INITIAL_WINDOW_SIZE] = stream_max_recv_window_size;
   SpdySerializedFrame initial_settings_frame(
       spdy_util_.ConstructSpdySettings(initial_settings));
 
   SpdySerializedFrame initial_window_update(
       spdy_util_.ConstructSpdyWindowUpdate(
           kSessionFlowControlStreamId,
           session_max_recv_window_size - kDefaultInitialWindowSize));
 
-  const SpdySerializedFrame* frames[3] = {&preface, &initial_settings_frame,
-                                          &initial_window_update};
-  char combined_frames[100];
-  int combined_frames_len = CombineFrames(
-      frames, arraysize(frames), combined_frames, arraysize(combined_frames));
+  SpdySerializedFrame combined_frames = CombineFrames(
+      {&preface, &initial_settings_frame, &initial_window_update});
 
   std::vector<MockWrite> writes;
-  writes.push_back(MockWrite(ASYNC, combined_frames, combined_frames_len));
+  writes.push_back(CreateMockWrite(combined_frames));
 
   SpdySerializedFrame req(
       spdy_util_.ConstructSpdyGet(nullptr, 0, 1, LOWEST, true));
   writes.push_back(CreateMockWrite(req, writes.size()));
 
   std::vector<MockRead> reads;
   SpdySerializedFrame resp(spdy_util_.ConstructSpdyGetReply(nullptr, 0, 1));
   reads.push_back(CreateMockRead(resp, writes.size() + reads.size()));
 
   std::vector<SpdySerializedFrame> body_frames;
@@ skipping 979 matching lines @@
 
 TEST_F(SpdyNetworkTransactionTLSUsageCheckTest, TLSCipherSuiteSucky) {
   auto ssl_provider = base::MakeUnique<SSLSocketDataProvider>(ASYNC, OK);
   // Set to TLS_RSA_WITH_NULL_MD5
   SSLConnectionStatusSetCipherSuite(0x1, &ssl_provider->connection_status);
 
   RunTLSUsageCheckTest(std::move(ssl_provider));
 }
 
 }  // namespace net