Update from https://crrev.com/316786

net/quic/crypto/crypto_framer.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/crypto/crypto_framer.h"
 
 #include "net/quic/crypto/crypto_protocol.h"
 #include "net/quic/quic_data_reader.h"
 #include "net/quic/quic_data_writer.h"
 
 using base::StringPiece;
-using std::make_pair;
 using std::pair;
 using std::vector;
 
 namespace net {
 
 namespace {
 
 const size_t kQuicTagSize = sizeof(uint32);
 const size_t kCryptoEndOffsetSize = sizeof(uint32);
 const size_t kNumEntriesSize = sizeof(uint16);
@@ skipping 76 matching lines @@
     if (delta > overhead) {
       pad_length = delta - overhead;
     }
     len += overhead + pad_length;
   }
 
   if (num_entries > kMaxEntries) {
     return nullptr;
   }
 
-
-  QuicDataWriter writer(len);
+  scoped_ptr<char[]> buffer(new char[len]);
+  QuicDataWriter writer(len, buffer.get());
   if (!writer.WriteUInt32(message.tag())) {
     DCHECK(false) << "Failed to write message tag.";
     return nullptr;
   }
   if (!writer.WriteUInt16(static_cast<uint16>(num_entries))) {
     DCHECK(false) << "Failed to write size.";
     return nullptr;
   }
   if (!writer.WriteUInt16(0)) {
     DCHECK(false) << "Failed to write padding.";
@@ skipping 53 matching lines @@
     }
   }
 
   if (need_pad_value) {
     if (!writer.WriteRepeatedByte('-', pad_length)) {
       DCHECK(false) << "Failed to write padding.";
       return nullptr;
     }
   }
 
-  return new QuicData(writer.take(), len, true);
+  return new QuicData(buffer.release(), len, true);
 }
 
 void CryptoFramer::Clear() {
   message_.Clear();
   tags_and_lengths_.clear();
   error_ = QUIC_NO_ERROR;
   state_ = STATE_READING_TAG;
 }
 
 QuicErrorCode CryptoFramer::Process(StringPiece input) {
@@ skipping 40 matching lines @@
           }
           return QUIC_CRYPTO_TAGS_OUT_OF_ORDER;
         }
 
         uint32 end_offset;
         reader.ReadUInt32(&end_offset);
 
         if (end_offset < last_end_offset) {
           return QUIC_CRYPTO_TAGS_OUT_OF_ORDER;
         }
-        tags_and_lengths_.push_back(
-            make_pair(tag, static_cast<size_t>(end_offset - last_end_offset)));
+        tags_and_lengths_.push_back(std::make_pair(
+            tag, static_cast<size_t>(end_offset - last_end_offset)));
         last_end_offset = end_offset;
       }
       values_len_ = last_end_offset;
       state_ = STATE_READING_VALUES;
     }
     case STATE_READING_VALUES:
       if (reader.BytesRemaining() < values_len_) {
         break;
       }
       for (vector<pair<QuicTag, size_t> >::const_iterator
@@ skipping 23 matching lines @@
   }
   *end_offset += pad_length;
   if (!writer->WriteUInt32(*end_offset)) {
     DCHECK(false) << "Failed to write end offset.";
     return false;
   }
   return true;
 }
 
 }  // namespace net