Implement SpdyMakeUnique and SpdyWrapUnique.

net/spdy/core/spdy_header_block.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/core/spdy_header_block.h"
 
 #include <string.h>
 
 #include <algorithm>
 #include <utility>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/values.h"
 #include "net/base/arena.h"
 #include "net/http/http_log_util.h"
 #include "net/log/net_log_capture_mode.h"
 #include "net/spdy/platform/api/spdy_estimate_memory_usage.h"
+#include "net/spdy/platform/api/spdy_ptr_util.h"
 #include "net/spdy/platform/api/spdy_string_utils.h"
 
 namespace net {
 namespace {
 
 // By default, linked_hash_map's internal map allocates space for 100 map
 // buckets on construction, which is larger than necessary.  Standard library
 // unordered map implementations use a list of prime numbers to set the bucket
 // count for a particular capacity.  |kInitialMapBuckets| is chosen to reduce
 // memory usage for small header blocks, at the cost of having to rehash for
@@ skipping 285 matching lines @@
 
 void SpdyHeaderBlock::AppendHeader(const SpdyStringPiece key,
                                    const SpdyStringPiece value) {
   auto* storage = GetStorage();
   auto backed_key = storage->Write(key);
   block_.emplace(std::make_pair(
       backed_key, HeaderValue(storage, backed_key, storage->Write(value))));
 }
 
 SpdyHeaderBlock::Storage* SpdyHeaderBlock::GetStorage() {
-  if (!storage_) {
-    storage_.reset(new Storage);
+  if (storage_ == nullptr) {
+    storage_ = SpdyMakeUnique<Storage>();
   }
   return storage_.get();
 }
 
 std::unique_ptr<base::Value> SpdyHeaderBlockNetLogCallback(
     const SpdyHeaderBlock* headers,
     NetLogCaptureMode capture_mode) {
   std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
   base::DictionaryValue* headers_dict = new base::DictionaryValue();
   for (SpdyHeaderBlock::const_iterator it = headers->begin();
@@ skipping 54 matching lines @@
   for (++it; it != fragments.end(); ++it) {
     memcpy(dst, separator.data(), separator.size());
     dst += separator.size();
     memcpy(dst, it->data(), it->size());
     dst += it->size();
   }
   return dst - original_dst;
 }
 
 }  // namespace net