Make ParametersToValue return scoped_ptr

net/log/net_log.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/log/net_log.h"
 
 #include "base/bind.h"
 #include "base/debug/alias.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 142 matching lines @@
   if (data_->parameters_callback) {
     scoped_ptr<base::Value> value(
         data_->parameters_callback->Run(capture_mode_));
     if (value)
       entry_dict->Set("params", value.Pass());
   }
 
   return entry_dict.release();
 }
 
-base::Value* NetLog::Entry::ParametersToValue() const {
+scoped_ptr<base::Value> NetLog::Entry::ParametersToValue() const {
   if (data_->parameters_callback)
-    return data_->parameters_callback->Run(capture_mode_).release();
-  return NULL;
+    return data_->parameters_callback->Run(capture_mode_);
+  return scoped_ptr<base::Value>(nullptr);

[mmenke, 2015/12/28 16:46:39]

I think you can just do return nullptr here?  If that doesn't work,, you can
just remove the nullptr - scoped_ptr has a 0-argument constructor.

 }
 
 NetLog::EntryData::EntryData(EventType type,
                              Source source,
                              EventPhase phase,
                              base::TimeTicks time,
                              const ParametersCallback* parameters_callback)
     : type(type),
       source(source),
       phase(phase),
@@ skipping 305 matching lines @@
   Liveness liveness = liveness_;
 
   if (liveness == ALIVE)
     return;
 
   base::debug::Alias(&liveness);
   CHECK_EQ(ALIVE, liveness);
 }
 
 }  // namespace net