Make ParametersToValue return scoped_ptr

net/log/test_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/test_net_log.h"
 
 #include "base/macros.h"
 #include "base/synchronization/lock.h"
 #include "base/values.h"
 
@@ skipping 32 matching lines @@
   void Clear() {
     base::AutoLock lock(lock_);
     entry_list_.clear();
   }
 
  private:
   // ThreadSafeObserver implementation:
   void OnAddEntry(const NetLog::Entry& entry) override {
     // Using Dictionaries instead of Values makes checking values a little
     // simpler.
-    base::DictionaryValue* param_dict = nullptr;
-    base::Value* param_value = entry.ParametersToValue();
-    if (param_value && !param_value->GetAsDictionary(&param_dict))
-      delete param_value;
+    scoped_ptr<base::DictionaryValue> param_dict =
+        base::DictionaryValue::From(entry.ParametersToValue());
 
     // Only need to acquire the lock when accessing class variables.
     base::AutoLock lock(lock_);
-    entry_list_.push_back(TestNetLogEntry(
-        entry.type(), base::TimeTicks::Now(), entry.source(), entry.phase(),
-        scoped_ptr<base::DictionaryValue>(param_dict)));
+    entry_list_.push_back(TestNetLogEntry(entry.type(), base::TimeTicks::Now(),
+                                          entry.source(), entry.phase(),
+                                          std::move(param_dict)));
   }
 
   // Needs to be "mutable" to use it in GetEntries().
   mutable base::Lock lock_;
 
   TestNetLogEntry::List entry_list_;
 
   DISALLOW_COPY_AND_ASSIGN(Observer);
 };
 
@@ skipping 54 matching lines @@
 
 void BoundTestNetLog::Clear() {
   test_net_log_.Clear();
 }
 
 void BoundTestNetLog::SetCaptureMode(NetLogCaptureMode capture_mode) {
   test_net_log_.SetCaptureMode(capture_mode);
 }
 
 }  // namespace net