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 27 matching lines @@
   return params->ToValue();
 }
 
 Value* SourceEventParametersCallback(const NetLog::Source source,
                                      NetLog::LogLevel /* log_level */) {
   DictionaryValue* event_params = new DictionaryValue();
   source.AddToEventParameters(event_params);
   return event_params;
 }
 
-Value* SingleIntegerCallback(const char* name,
+Value* NetLogIntegerCallback(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* NetLogStringCallback(const char* name,
+                            const std::string* value,
+                            NetLog::LogLevel /* log_level */) {
+  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 188 matching lines @@
 }
 
 // static
 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);
+  return base::Bind(&NetLogIntegerCallback, name, value);
+}
+
+// static
+NetLog::ParametersCallback NetLog::StringCallback(const char* name,
+                                                  const std::string* value) {
+  DCHECK(value);
+  return base::Bind(&NetLogStringCallback, 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) {
@@ skipping 92 matching lines @@
 void BoundNetLog::AddEventWithNetErrorCode(NetLog::EventType event_type,
                                            int net_error) const {
   DCHECK_GT(0, net_error);
   DCHECK_NE(ERR_IO_PENDING, net_error);
   AddEvent(event_type, NetLog::IntegerCallback("net_error", net_error));
 }
 
 void BoundNetLog::EndEventWithNetErrorCode(NetLog::EventType event_type,
                                            int net_error) const {
   DCHECK_NE(ERR_IO_PENDING, net_error);
-  EndEvent(event_type, NetLog::IntegerCallback("net_error", net_error));
+  if (net_error >= 0) {
+    EndEvent(event_type);
+  } else {
+    EndEvent(event_type, NetLog::IntegerCallback("net_error", net_error));
+  }
 }
 
 void BoundNetLog::AddByteTransferEvent(NetLog::EventType event_type,
                                        int byte_count,
                                        const char* bytes) const {
   AddEvent(event_type, base::Bind(BytesTransferredCallback, byte_count, bytes));
 }
 
 NetLog::LogLevel BoundNetLog::GetLogLevel() const {
   if (net_log_)
@@ skipping 40 matching lines @@
 }
 
 Value* NetLogSourceParameter::ToValue() const {
   DictionaryValue* dict = new DictionaryValue();
   if (value_.is_valid())
     dict->Set(name_, value_.ToValue());
   return dict;
 }
 
 }  // namespace net