NetLogEventParameter to Callback refactoring 1,

net/base/net_log.cc

Index: net/base/net_log.cc
===================================================================
--- net/base/net_log.cc	(revision 141407)
+++ net/base/net_log.cc	(working copy)
@@ -55,6 +55,16 @@
   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 {
@@ -266,6 +276,12 @@
   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;