Update from https://crrev.com/316786

net/quic/quic_data_writer_test.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/quic/quic_data_writer.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "net/quic/quic_data_reader.h"
 #include "net/test/gtest_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 namespace test {
 namespace {
 
 TEST(QuicDataWriterTest, WriteUInt8ToOffset) {
-  QuicDataWriter writer(4);
+  char buffer[4];
+  QuicDataWriter writer(4, buffer);
 
   writer.WriteUInt32(0xfefdfcfb);
   EXPECT_TRUE(writer.WriteUInt8ToOffset(1, 0));
   EXPECT_TRUE(writer.WriteUInt8ToOffset(2, 1));
   EXPECT_TRUE(writer.WriteUInt8ToOffset(3, 2));
   EXPECT_TRUE(writer.WriteUInt8ToOffset(4, 3));
 
-  scoped_ptr<char[]> data(writer.take());
-
-  EXPECT_EQ(1, data[0]);
-  EXPECT_EQ(2, data[1]);
-  EXPECT_EQ(3, data[2]);
-  EXPECT_EQ(4, data[3]);
+  EXPECT_EQ(1, writer.data()[0]);
+  EXPECT_EQ(2, writer.data()[1]);
+  EXPECT_EQ(3, writer.data()[2]);
+  EXPECT_EQ(4, writer.data()[3]);
 }
 
 TEST(QuicDataWriterDeathTest, WriteUInt8ToOffset) {
-  QuicDataWriter writer(4);
+  char buffer[4];
+  QuicDataWriter writer(4, buffer);
 
   EXPECT_DFATAL(EXPECT_FALSE(writer.WriteUInt8ToOffset(5, 4)),
                 "offset: 4 >= capacity: 4");
 }
 
 TEST(QuicDataWriterTest, SanityCheckUFloat16Consts) {
   // Check the arithmetic on the constants - otherwise the values below make
   // no sense.
   EXPECT_EQ(30, kUFloat16MaxExponent);
   EXPECT_EQ(11, kUFloat16MantissaBits);
@@ skipping 28 matching lines @@
     { 0x20040000000, 0xF801}, { 0x20040000001, 0xF801},
     // Transition into the max value and clamping.
     { 0x3FF80000000, 0xFFFE}, { 0x3FFBFFFFFFF, 0xFFFE},
     { 0x3FFC0000000, 0xFFFF}, { 0x3FFC0000001, 0xFFFF},
     { 0x3FFFFFFFFFF, 0xFFFF}, { 0x40000000000, 0xFFFF},
     { 0xFFFFFFFFFFFFFFFF, 0xFFFF},
   };
   int num_test_cases = sizeof(test_cases) / sizeof(test_cases[0]);
 
   for (int i = 0; i < num_test_cases; ++i) {
-    QuicDataWriter writer(2);
+    char buffer[2];
+    QuicDataWriter writer(2, buffer);
     EXPECT_TRUE(writer.WriteUFloat16(test_cases[i].decoded));
-    scoped_ptr<char[]> data(writer.take());
-    EXPECT_EQ(test_cases[i].encoded, *reinterpret_cast<uint16*>(data.get()));
+    EXPECT_EQ(test_cases[i].encoded, *reinterpret_cast<uint16*>(writer.data()));
   }
 }
 
 TEST(QuicDataWriterTest, ReadUFloat16) {
   struct TestCase {
     uint64 decoded;
     uint16 encoded;
   };
   TestCase test_cases[] = {
     // There are fewer decoding test cases because encoding truncates, and
@@ skipping 40 matching lines @@
     if (i < 4097)
       EXPECT_EQ(i, value);
     // Check there's monotonic growth.
     EXPECT_LT(previous_value, value);
     // Check that precision is within 0.5% away from the denormals.
     if (i > 2000)
       EXPECT_GT(previous_value * 1005, value * 1000);
     // Check we're always within the promised range.
     EXPECT_LT(value, GG_UINT64_C(0x3FFC0000000));
     previous_value = value;
-    QuicDataWriter writer(6);
+    char buffer[6];
+    QuicDataWriter writer(6, buffer);
     EXPECT_TRUE(writer.WriteUFloat16(value - 1));
     EXPECT_TRUE(writer.WriteUFloat16(value));
     EXPECT_TRUE(writer.WriteUFloat16(value + 1));
-    scoped_ptr<char[]> data(writer.take());
     // Check minimal decoding (previous decoding has previous encoding).
-    EXPECT_EQ(i-1, *reinterpret_cast<uint16*>(data.get()));
+    EXPECT_EQ(i - 1, *reinterpret_cast<uint16*>(writer.data()));
     // Check roundtrip.
-    EXPECT_EQ(i, *reinterpret_cast<uint16*>(data.get() + 2));
+    EXPECT_EQ(i, *reinterpret_cast<uint16*>(writer.data() + 2));
     // Check next decoding.
-    EXPECT_EQ(i < 4096? i+1 : i, *reinterpret_cast<uint16*>(data.get() + 4));
+    EXPECT_EQ(i < 4096 ? i + 1 : i,
+              *reinterpret_cast<uint16*>(writer.data() + 4));
   }
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net