Simplify CombineFrames() interface.

net/spdy/chromium/spdy_session_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 "net/spdy/chromium/spdy_session.h"
 
 #include <algorithm>
 #include <memory>
 #include <utility>
 
@@ skipping 5498 matching lines @@
   void RunInitialSettingsTest(const SettingsMap expected_settings) {
     session_deps_.host_resolver->set_synchronous_mode(true);
 
     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));
-    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));
     session_deps_.socket_factory->AddSocketDataProvider(&data);
     AddSSLSocketData();
 
     CreateNetworkSession();
 
     SpdySessionPoolPeer pool_peer(spdy_session_pool_);
     pool_peer.SetEnableSendingInitialData(true);
@@ skipping 611 matching lines @@
   ssl_info.cert = ImportCertFromFile(GetTestCertsDirectory(),
                                      "spdy_pooling.pem");
   ssl_info.is_issued_by_known_root = true;
   ssl_info.public_key_hashes.push_back(test::GetTestHashValue(primary_pin));
 
   EXPECT_TRUE(SpdySession::CanPool(
       &tss, ssl_info, "www.example.org", "mail.example.org"));
 }
 
 }  // namespace net