Remove SetWithoutPathExpansion

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/memory/ptr_util.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_string_utils.h"
 
 namespace net {
 namespace {
 
@@ skipping 299 matching lines @@
 SpdyHeaderBlock::Storage* SpdyHeaderBlock::GetStorage() {
   if (!storage_) {
     storage_.reset(new 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();
+  auto dict = base::MakeUnique<base::DictionaryValue>();
+  auto headers_dict = base::MakeUnique<base::DictionaryValue>();
   for (SpdyHeaderBlock::const_iterator it = headers->begin();
        it != headers->end(); ++it) {
-    headers_dict->SetWithoutPathExpansion(
+    headers_dict->SetStringWithoutPathExpansion(
         it->first.as_string(),
-        new base::Value(ElideHeaderValueForNetLog(
-            capture_mode, it->first.as_string(), it->second.as_string())));
+        ElideHeaderValueForNetLog(capture_mode, it->first.as_string(),
+                                  it->second.as_string()));
   }
-  dict->Set("headers", headers_dict);
+  dict->Set("headers", std::move(headers_dict));
   return std::move(dict);
 }
 
 bool SpdyHeaderBlockFromNetLogParam(
     const base::Value* event_param,
     SpdyHeaderBlock* headers) {
   headers->clear();
 
   const base::DictionaryValue* dict = NULL;
   const base::DictionaryValue* header_dict = NULL;
@@ skipping 37 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