Make NetLog take in callbacks that return Values

net/base/capturing_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/base/capturing_net_log.h"
 
 #include "base/logging.h"
 #include "base/values.h"
 
 namespace net {
@@ skipping 62 matching lines @@
 void CapturingNetLog::Clear() {
   base::AutoLock lock(lock_);
   captured_entries_.clear();
 }
 
 void CapturingNetLog::SetLogLevel(NetLog::LogLevel log_level) {
   base::AutoLock lock(lock_);
   log_level_ = log_level;
 }
 
-void CapturingNetLog::AddEntry(
-    EventType type,
-    const Source& source,
-    EventPhase phase,
-    const scoped_refptr<EventParameters>& extra_parameters) {
+void CapturingNetLog::OnAddEntry(const net::NetLog::Entry& entry) {
   // Only BoundNetLogs without a NetLog should have an invalid source.
-  DCHECK(source.is_valid());
+  DCHECK(entry.source().is_valid());
 
   // Using Dictionaries instead of Values makes checking values a little
   // simpler.
   DictionaryValue* param_dict = NULL;
-  if (extra_parameters) {
-    Value* param_value = extra_parameters->ToValue();
-    if (param_value && !param_value->GetAsDictionary(&param_dict))
-      delete param_value;
-  }
+  Value* param_value = entry.ParametersToValue();
+  if (param_value && !param_value->GetAsDictionary(&param_dict))
+    delete param_value;
 
   // Only need to acquire the lock when accessing class variables.
   base::AutoLock lock(lock_);
   captured_entries_.push_back(
-      CapturedEntry(type,
+      CapturedEntry(entry.type(),
                     base::TimeTicks::Now(),
-                    source,
-                    phase,
+                    entry.source(),
+                    entry.phase(),
                     scoped_ptr<DictionaryValue>(param_dict)));
 }
 
 uint32 CapturingNetLog::NextID() {
   return base::subtle::NoBarrier_AtomicIncrement(&last_id_, 1);
 }
 
 NetLog::LogLevel CapturingNetLog::GetLogLevel() const {
   base::AutoLock lock(lock_);
   return log_level_;
@@ skipping 29 matching lines @@
 
 void CapturingBoundNetLog::Clear() {
   capturing_net_log_.Clear();
 }
 
 void CapturingBoundNetLog::SetLogLevel(NetLog::LogLevel log_level) {
   capturing_net_log_.SetLogLevel(log_level);
 }
 
 }  // namespace net