Cleanup: Address some of the todos in net_log.h...

net/base/net_log_util.cc

 // Copyright (c) 2009 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_util.h"
 
 #include "base/format_macros.h"
+#include "base/json/json_writer.h"
 #include "base/string_util.h"
+#include "base/values.h"
 #include "net/base/net_errors.h"
 
 namespace net {
 namespace {
 
 class FormatHelper {
  public:
   std::string ToString(const std::vector<CapturingNetLog::Entry>& entries,
                        size_t num_entries_truncated) {
     entries_.clear();
@@ skipping 23 matching lines @@
           static_cast<size_t>(entries_[i].block_index + 1) == i) {
         // If there were no entries in between the START/END block then don't
         // bother printing a line for END (it just adds noise, and we already
         // show the time delta besides START anyway).
         continue;
       }
 
       int indentation_spaces = entries_[i].indentation * kSpacesPerIndentation;
       std::string entry_str = GetEntryString(i);
 
-      // Hack to better print known event types.
-      if (entries_[i].log_entry->type == NetLog::TYPE_TODO_STRING ||
-          entries_[i].log_entry->type == NetLog::TYPE_TODO_STRING_LITERAL) {
-        // Don't display the TODO_STRING type.
-        entry_str = StringPrintf(
-            " \"%s\"",
-            entries_[i].log_entry->extra_parameters->ToString().c_str());
-      }
-
       StringAppendF(&result, "t=%s: %s%s",
                     PadStringLeft(GetTimeString(i), max_time_width).c_str(),
                     PadStringLeft("", indentation_spaces).c_str(),
                     entry_str.c_str());
 
       if (entries_[i].IsBeginEvent()) {
         // Summarize how long this block lasted.
         int padding = ((max_indentation - entries_[i].indentation) *
             kSpacesPerIndentation) + (max_type_width - entry_str.size());
         StringAppendF(&result, "%s [dt=%s]",
                       PadStringLeft("", padding).c_str(),
                       PadStringLeft(GetBlockDtString(i), max_dt_width).c_str());
       }
 
       // Append any custom parameters.
       NetLog::EventParameters* extra_params =
           entries_[i].log_entry->extra_parameters;
-      NetLog::EventType type = entries_[i].log_entry->type;
-      NetLog::EventPhase phase = entries_[i].log_entry->phase;
 
-      if (type != NetLog::TYPE_TODO_STRING &&
-          type != NetLog::TYPE_TODO_STRING_LITERAL &&
-          extra_params) {
+      if (extra_params) {
         std::string extra_details;
-
-        // Hacks to better print known event types.
-        if (type == NetLog::TYPE_URL_REQUEST_START ||
-            type == NetLog::TYPE_SOCKET_STREAM_CONNECT) {
-          if (phase == NetLog::PHASE_BEGIN) {
-            extra_details =
-                StringPrintf("url: %s", extra_params->ToString().c_str());
-          } else if (phase == NetLog::PHASE_END) {
-            int error_code = static_cast<NetLogIntegerParameter*>(
-                extra_params)->value();
-            extra_details = StringPrintf("net error: %d (%s)",
-                                         error_code,
-                                         ErrorToString(error_code));
-          }
-        } else if (type == NetLog::TYPE_SOCKET_POOL_CONNECT_JOB) {
-          extra_details =
-              StringPrintf("group: %s", extra_params->ToString().c_str());
-        } else {
-          extra_details = extra_params->ToString();
-        }
-
-        int indentation = max_time_width + indentation_spaces +
-                          kSpacesPerIndentation + 5;
-
-        StringAppendF(
-            &result,
-            "\n%s%s",
-            PadStringLeft("", indentation).c_str(),
-            extra_details.c_str());
+        scoped_ptr<Value> extra_details_value(extra_params->ToValue());
+        base::JSONWriter::Write(extra_details_value.get(), true,
+                                &extra_details);
+        // JSON writer uses CR LF in its pretty-printer. Normalize to newlines.
+        ReplaceSubstringsAfterOffset(&extra_details, 0, "\r\n", "\n");
+        result.append("\n");
+        result.append(extra_details);
       }
 
-      if (i + 1 != entries_.size())
+      if (!extra_params && i + 1 != entries_.size())
         result += "\n";
     }
 
     return result;
   }
 
  private:
   struct Entry {
     explicit Entry(const CapturingNetLog::Entry* log_entry)
         : log_entry(log_entry), indentation(0), block_index(-1) {}
@@ skipping 132 matching lines @@
 
 // static
 std::string NetLogUtil::PrettyPrintAsEventTree(
     const std::vector<CapturingNetLog::Entry>& entries,
     size_t num_entries_truncated) {
   FormatHelper helper;
   return helper.ToString(entries, num_entries_truncated);
 }
 
 }  // namespace net