NetLogEventParameter to Callback refactoring 1,

net/base/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/net_log.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/time.h"
@@ skipping 37 matching lines @@
 Value* SingleIntegerCallback(const char* name,
                              int value,
                              NetLog::LogLevel /* log_level */) {
   if (!value)
     return NULL;
   DictionaryValue* event_params = new DictionaryValue();
   event_params->SetInteger(name, value);
   return event_params;
 }
 
+Value* SingleStringCallback(const char* name,
+                            const std::string* value,
+                            NetLog::LogLevel /* log_level */) {
+  if (!value)

[eroman, 2012/06/11 23:42:25]

Is it necessary to allow this? Seems like passing a NULL value could probably be
defined as an error instead.

[mmenke, 2012/06/12 00:42:19]

You're right, done.  Also, noticed other related bugs - SingleIntegerCallback
should also not have the check, but Add/EndEventWithNetError should (Think I was
planning on a specific callback for errors, then changed my mind, though the
test above was still wrong).

+    return NULL;
+  DictionaryValue* event_params = new DictionaryValue();
+  event_params->SetString(name, *value);
+  return event_params;
+}
+
 }  // namespace
 
 Value* NetLog::Source::ToValue() const {
   DictionaryValue* dict = new DictionaryValue();
   dict->SetInteger("type", static_cast<int>(type));
   dict->SetInteger("id", static_cast<int>(id));
   return dict;
 }
 
 void NetLog::Source::AddToEventParameters(DictionaryValue* event_params) const {
@@ skipping 191 matching lines @@
 bool NetLog::IsLoggingAllEvents(LogLevel log_level) {
   return log_level <= NetLog::LOG_ALL_BUT_BYTES;
 }
 
 // static
 NetLog::ParametersCallback NetLog::IntegerCallback(const char* name,
                                                    int value) {
   return base::Bind(&SingleIntegerCallback, name, value);
 }
 
+// static
+NetLog::ParametersCallback NetLog::StringCallback(const char* name,
+                                                  const std::string* value) {
+  return base::Bind(&SingleStringCallback, name, value);
+}
+
 void NetLog::OnAddObserver(ThreadSafeObserver* observer, LogLevel log_level) {
   DCHECK(!observer->net_log_);
   observer->net_log_ = this;
   observer->log_level_ = log_level;
 }
 
 void NetLog::OnSetObserverLogLevel(ThreadSafeObserver* observer,
                                    LogLevel log_level) {
   DCHECK_EQ(this, observer->net_log_);
   observer->log_level_ = log_level;
@@ skipping 151 matching lines @@
 }
 
 Value* NetLogSourceParameter::ToValue() const {
   DictionaryValue* dict = new DictionaryValue();
   if (value_.is_valid())
     dict->Set(name_, value_.ToValue());
   return dict;
 }
 
 }  // namespace net