More cleanup of net_log.h

net/base/capturing_net_log.cc

 // Copyright (c) 2010 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/logging.h"
-#include "base/string_util.h"
+#include "net/base/capturing_net_log.h"
 
 namespace net {
 
-// static
-const char* NetLog::EventTypeToString(EventType event) {
-  switch (event) {
-#define EVENT_TYPE(label) case TYPE_ ## label: return #label;
-#include "net/base/net_log_event_type_list.h"
-#undef EVENT_TYPE
-  }
-  return NULL;
-}
-
-// static
-std::vector<NetLog::EventType> NetLog::GetAllEventTypes() {
-  std::vector<NetLog::EventType> types;
-#define EVENT_TYPE(label) types.push_back(TYPE_ ## label);
-#include "net/base/net_log_event_type_list.h"
-#undef EVENT_TYPE
-  return types;
-}
-
-void BoundNetLog::AddEntry(NetLog::EventType type,
-                           NetLog::EventPhase phase,
-                           NetLog::EventParameters* extra_parameters) const {
-  if (net_log_) {
-    net_log_->AddEntry(type, base::TimeTicks::Now(), source_, phase,
-                       extra_parameters);
-  }
-}
-
-void BoundNetLog::AddEntryWithTime(
-    NetLog::EventType type,
-    const base::TimeTicks& time,
-    NetLog::EventPhase phase,
-    NetLog::EventParameters* extra_parameters) const {
-  if (net_log_) {
-    net_log_->AddEntry(type, time, source_, phase, extra_parameters);
-  }
-}
-
-bool BoundNetLog::HasListener() const {
-  if (net_log_)
-    return net_log_->HasListener();
-  return false;
-}
-
-void BoundNetLog::AddEvent(NetLog::EventType event_type) const {
-  AddEventWithParameters(event_type, NULL);
-}
-
-void BoundNetLog::AddEventWithParameters(
-    NetLog::EventType event_type,
-    NetLog::EventParameters* params) const {
-  AddEntry(event_type, NetLog::PHASE_NONE, params);
-}
-
-void BoundNetLog::AddEventWithInteger(NetLog::EventType event_type,
-                                      int integer) const {
-  scoped_refptr<NetLog::EventParameters> params =
-      new NetLogIntegerParameter(integer);
-  AddEventWithParameters(event_type, params);
-}
-
-void BoundNetLog::BeginEvent(NetLog::EventType event_type) const {
-  BeginEventWithParameters(event_type, NULL);
-}
-
-void BoundNetLog::BeginEventWithParameters(
-    NetLog::EventType event_type,
-    NetLog::EventParameters* params) const {
-  AddEntry(event_type, NetLog::PHASE_BEGIN, params);
-}
-
-void BoundNetLog::BeginEventWithString(NetLog::EventType event_type,
-                                       const std::string& string) const {
-  scoped_refptr<NetLog::EventParameters> params =
-      new NetLogStringParameter(string);
-  BeginEventWithParameters(event_type, params);
-}
-
-void BoundNetLog::BeginEventWithInteger(NetLog::EventType event_type,
-                                        int integer) const {
-  scoped_refptr<NetLog::EventParameters> params =
-      new NetLogIntegerParameter(integer);
-  BeginEventWithParameters(event_type, params);
-}
-
-void BoundNetLog::EndEvent(NetLog::EventType event_type) const {
-  EndEventWithParameters(event_type, NULL);
-}
-
-void BoundNetLog::EndEventWithParameters(
-    NetLog::EventType event_type,
-    NetLog::EventParameters* params) const {
-  AddEntry(event_type, NetLog::PHASE_END, params);
-}
-
-void BoundNetLog::EndEventWithInteger(NetLog::EventType event_type,
-                                      int integer) const {
-  scoped_refptr<NetLog::EventParameters> params =
-      new NetLogIntegerParameter(integer);
-  EndEventWithParameters(event_type, params);
-}
-
-void BoundNetLog::AddString(const std::string& string) const {
-  // We pass TYPE_TODO_STRING since we have no event type to associate this
-  // with. (AddString() is deprecated, and should be replaced with
-  // AddEventWithParameters()).
-  scoped_refptr<NetLog::EventParameters> params =
-      new NetLogStringParameter(string);
-  AddEventWithParameters(NetLog::TYPE_TODO_STRING, params);
-}
-
-void BoundNetLog::AddStringLiteral(const char* literal) const {
-  // We pass TYPE_TODO_STRING_LITERAL since we have no event type to associate
-  // this with. (AddString() is deprecated, and should be replaced with
-  // AddEventWithParameters()).
-  scoped_refptr<NetLog::EventParameters> params =
-      new NetLogStringLiteralParameter(literal);
-  AddEventWithParameters(NetLog::TYPE_TODO_STRING_LITERAL, params);
-}
-
-// static
-BoundNetLog BoundNetLog::Make(NetLog* net_log,
-                              NetLog::SourceType source_type) {
-  if (!net_log)
-    return BoundNetLog();
-
-  NetLog::Source source(source_type, net_log->NextID());
-  return BoundNetLog(source, net_log);
-}
-
-NetLogStringParameter::NetLogStringParameter(const std::string& value)
-    : value_(value) {
-}
-
-std::string NetLogIntegerParameter::ToString() const {
-  return IntToString(value_);
-}
-
-std::string NetLogStringLiteralParameter::ToString() const {
-  return std::string(value_);
+CapturingNetLog::CapturingNetLog(size_t max_num_entries)
+    : next_id_(0), max_num_entries_(max_num_entries) {
 }
 
 void CapturingNetLog::AddEntry(EventType type,
                                const base::TimeTicks& time,
                                const Source& source,
                                EventPhase phase,
                                EventParameters* extra_parameters) {
   Entry entry(type, time, source, phase, extra_parameters);
   if (entries_.size() + 1 < max_num_entries_)
     entries_.push_back(entry);
@@ skipping 13 matching lines @@
 
 void CapturingBoundNetLog::AppendTo(const BoundNetLog& net_log) const {
   for (size_t i = 0; i < entries().size(); ++i) {
     const CapturingNetLog::Entry& entry = entries()[i];
     net_log.AddEntryWithTime(entry.type, entry.time, entry.phase,
                              entry.extra_parameters);
   }
 }
 
 }  // namespace net