Simplify CombineFrames() interface.

net/spdy/chromium/spdy_test_util_common.cc

 // Copyright (c) 2013 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 "net/spdy/chromium/spdy_test_util_common.h"
 
 #include <stdint.h>
 
 #include <cstddef>
 #include <utility>
@@ skipping 144 matching lines @@
 MockRead CreateMockRead(const SpdySerializedFrame& resp, int seq) {
   return CreateMockRead(resp, seq, ASYNC);
 }
 
 // Create a MockRead from the given SpdySerializedFrame and sequence number.
 MockRead CreateMockRead(const SpdySerializedFrame& resp, int seq, IoMode mode) {
   return MockRead(mode, resp.data(), resp.size(), seq);
 }
 
 // Combines the given SpdyFrames into the given char array and returns
 // the total length.

[Zhongyi Shi, 2017/06/12 19:34:12]

ditto.

[Bence, 2017/06/12 19:49:13]

Done.

-int CombineFrames(const SpdySerializedFrame** frames,
-                  int num_frames,
-                  char* buf,
-                  int buf_len) {
-  int total_len = 0;
-  for (int i = 0; i < num_frames; ++i) {
-    total_len += frames[i]->size();
+SpdySerializedFrame CombineFrames(
+    std::vector<const SpdySerializedFrame*> frames) {
+  int total_size = 0;
+  for (const auto* frame : frames) {
+    total_size += frame->size();
   }
-  DCHECK_LE(total_len, buf_len);
-  char* ptr = buf;
-  for (int i = 0; i < num_frames; ++i) {
-    int len = frames[i]->size();
-    memcpy(ptr, frames[i]->data(), len);
-    ptr += len;
+  auto data = base::MakeUnique<char[]>(total_size);
+  char* ptr = data.get();
+  for (const auto* frame : frames) {
+    memcpy(ptr, frame->data(), frame->size());
+    ptr += frame->size();
   }
-  return total_len;
+  return SpdySerializedFrame(data.release(), total_size,
+                             /* owns_buffer = */ true);
 }
 
 namespace {
 
 class PriorityGetter : public BufferedSpdyFramerVisitorInterface {
  public:
   PriorityGetter() : priority_(0) {}
   ~PriorityGetter() override {}
 
   SpdyPriority priority() const {
@@ skipping 699 matching lines @@
       response_spdy_framer_.SerializeFrame(push_promise));
 
   SpdyHeaderBlock headers_header_block;
   headers_header_block[GetStatusKey()] = "200";
   headers_header_block["hello"] = "bye";
   AppendToHeaderBlock(extra_headers, extra_header_count, &headers_header_block);
   SpdyHeadersIR headers(stream_id, std::move(headers_header_block));
   SpdySerializedFrame headers_frame(
       response_spdy_framer_.SerializeFrame(headers));
 
-  int joint_data_size = push_promise_frame.size() + headers_frame.size();
-  auto data = base::MakeUnique<char[]>(joint_data_size);
-  const SpdySerializedFrame* frames[2] = {
-      &push_promise_frame, &headers_frame,
-  };
-  int combined_size =
-      CombineFrames(frames, arraysize(frames), data.get(), joint_data_size);
-  DCHECK_EQ(combined_size, joint_data_size);
-  return SpdySerializedFrame(data.release(), joint_data_size, true);
+  return CombineFrames({&push_promise_frame, &headers_frame});
 }
 
 SpdySerializedFrame SpdyTestUtil::ConstructSpdyPush(
     const char* const extra_headers[],
     int extra_header_count,
     int stream_id,
     int associated_stream_id,
     const char* url,
     const char* status,
     const char* location) {
   SpdyHeaderBlock push_promise_header_block;
   AddUrlToHeaderBlock(url, &push_promise_header_block);
   SpdyPushPromiseIR push_promise(associated_stream_id, stream_id,
                                  std::move(push_promise_header_block));
   SpdySerializedFrame push_promise_frame(
       response_spdy_framer_.SerializeFrame(push_promise));
 
   SpdyHeaderBlock headers_header_block;
   headers_header_block["hello"] = "bye";
   headers_header_block[GetStatusKey()] = status;
   headers_header_block["location"] = location;
   AppendToHeaderBlock(extra_headers, extra_header_count, &headers_header_block);
   SpdyHeadersIR headers(stream_id, std::move(headers_header_block));
   SpdySerializedFrame headers_frame(
       response_spdy_framer_.SerializeFrame(headers));
 
-  int joint_data_size = push_promise_frame.size() + headers_frame.size();
-  auto data = base::MakeUnique<char[]>(joint_data_size);
-  const SpdySerializedFrame* frames[2] = {
-      &push_promise_frame, &headers_frame,
-  };
-  int combined_size =
-      CombineFrames(frames, arraysize(frames), data.get(), joint_data_size);
-  DCHECK_EQ(combined_size, joint_data_size);
-  return SpdySerializedFrame(data.release(), joint_data_size, true);
+  return CombineFrames({&push_promise_frame, &headers_frame});
 }
 
 SpdySerializedFrame SpdyTestUtil::ConstructInitialSpdyPushFrame(
     SpdyHeaderBlock headers,
     int stream_id,
     int associated_stream_id) {
   SpdyPushPromiseIR push_promise(associated_stream_id, stream_id,
                                  std::move(headers));
   return SpdySerializedFrame(
       response_spdy_framer_.SerializeFrame(push_promise));
@@ skipping 204 matching lines @@
   headers[GetSchemeKey()] = scheme.c_str();
   headers[GetPathKey()] = path.c_str();
   if (content_length) {
     SpdyString length_str = base::Int64ToString(*content_length);
     headers["content-length"] = length_str;
   }
   return headers;
 }
 
 }  // namespace net