NetLogEventParameter to Callback refactoring 11.

content/browser/download/download_net_log_parameters.cc

Index: content/browser/download/download_net_log_parameters.cc
===================================================================
--- content/browser/download/download_net_log_parameters.cc	(revision 142108)
+++ content/browser/download/download_net_log_parameters.cc	(working copy)
@@ -5,10 +5,12 @@
 #include "content/browser/download/download_net_log_parameters.h"
 
 #include "base/basictypes.h"
+#include "base/file_path.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/values.h"
 #include "content/public/browser/download_interrupt_reasons.h"
+#include "googleurl/src/gurl.h"
 #include "net/base/net_errors.h"
 
 namespace download_net_logs {
@@ -45,225 +47,131 @@
 
 }  // namespace
 
-ItemActivatedParameters::ItemActivatedParameters(
+base::Value* ItemActivatedCallback(
+    const content::DownloadItem* download_item,
     DownloadType download_type,
-    int64 id,
-    const std::string& original_url,
-    const std::string& final_url,
-    const std::string& file_name,
-    content::DownloadDangerType danger_type,
-    content::DownloadItem::SafetyState safety_state,
-    int64 start_offset)
-        : type_(download_type),
-          id_(id),
-          original_url_(original_url),
-          final_url_(final_url),
-          file_name_(file_name),
-          danger_type_(danger_type),
-          safety_state_(safety_state),
-          start_offset_(start_offset) {
-}
-
-Value* ItemActivatedParameters::ToValue() const {
+    const std::string* file_name,
+    net::NetLog::LogLevel /* log_level */) {
   DictionaryValue* dict = new DictionaryValue();
 
-  dict->SetString("type", download_type_names[type_]);
-  dict->SetString("id", base::Int64ToString(id_));
-  dict->SetString("original_url", original_url_);
-  dict->SetString("final_url", final_url_);
-  dict->SetString("file_name", file_name_);
-  dict->SetString("danger_type", download_danger_names[danger_type_]);
-  dict->SetString("safety_state", download_safety_names[safety_state_]);
-  dict->SetString("start_offset", base::Int64ToString(start_offset_));
+  dict->SetString("type", download_type_names[download_type]);
+  dict->SetString("id", base::Int64ToString(download_item->GetId()));
+  dict->SetString("original_url", download_item->GetOriginalUrl().spec());
+  dict->SetString("final_url", download_item->GetURL().spec());
+  dict->SetString("file_name", *file_name);
+  dict->SetString("danger_type",
+                  download_danger_names[download_item->GetDangerType()]);
+  dict->SetString("safety_state",
+                  download_safety_names[download_item->GetSafetyState()]);
+  dict->SetString("start_offset",
+                  base::Int64ToString(download_item->GetReceivedBytes()));
 
   return dict;
 }
 
-ItemActivatedParameters::~ItemActivatedParameters() {}
-
-ItemCheckedParameters::ItemCheckedParameters(
+base::Value* ItemCheckedCallback(
     content::DownloadDangerType danger_type,
-    content::DownloadItem::SafetyState safety_state)
-        : danger_type_(danger_type), safety_state_(safety_state) {
-}
-
-Value* ItemCheckedParameters::ToValue() const {
+    content::DownloadItem::SafetyState safety_state,
+    net::NetLog::LogLevel /* log_level */) {
   DictionaryValue* dict = new DictionaryValue();
 
-  dict->SetString("danger_type", download_danger_names[danger_type_]);
-  dict->SetString("safety_state", download_safety_names[safety_state_]);
+  dict->SetString("danger_type", download_danger_names[danger_type]);
+  dict->SetString("safety_state", download_safety_names[safety_state]);
 
   return dict;
 }
 
-ItemCheckedParameters::~ItemCheckedParameters() {}
-
-ItemInHistoryParameters::ItemInHistoryParameters(int64 handle)
-    : db_handle_(handle) {
-}
-
-Value* ItemInHistoryParameters::ToValue() const {
+base::Value* ItemRenamedCallback(const FilePath* old_filename,
+                                 const FilePath* new_filename,
+                                 net::NetLog::LogLevel /* log_level */) {
   DictionaryValue* dict = new DictionaryValue();
 
-  dict->SetString("db_handle", base::Int64ToString(db_handle_));
+  dict->SetString("old_filename", old_filename->AsUTF8Unsafe());
+  dict->SetString("new_filename", new_filename->AsUTF8Unsafe());
 
   return dict;
 }
 
-ItemInHistoryParameters::~ItemInHistoryParameters() {}
-
-ItemUpdatedParameters::ItemUpdatedParameters(int64 bytes_so_far)
-    : bytes_so_far_(bytes_so_far) {
-}
-
-Value* ItemUpdatedParameters::ToValue() const {
+base::Value* ItemInterruptedCallback(content::DownloadInterruptReason reason,
+                                     int64 bytes_so_far,
+                                     const std::string* hash_state,
+                                     net::NetLog::LogLevel /* log_level */) {
   DictionaryValue* dict = new DictionaryValue();
 
-  dict->SetString("bytes_so_far", base::Int64ToString(bytes_so_far_));
-
-  return dict;
-}
-
-ItemUpdatedParameters::~ItemUpdatedParameters() {}
-
-ItemRenamedParameters::ItemRenamedParameters(
-    const std::string& old_filename, const std::string& new_filename)
-        : old_filename_(old_filename), new_filename_(new_filename) {
-}
-
-Value* ItemRenamedParameters::ToValue() const {
-  DictionaryValue* dict = new DictionaryValue();
-
-  dict->SetString("old_filename", old_filename_);
-  dict->SetString("new_filename", new_filename_);
-
-  return dict;
-}
-
-ItemRenamedParameters::~ItemRenamedParameters() {}
-
-ItemInterruptedParameters::ItemInterruptedParameters(
-    content::DownloadInterruptReason reason,
-    int64 bytes_so_far,
-    const std::string& hash_state)
-        : reason_(reason),
-          bytes_so_far_(bytes_so_far),
-          hash_state_(hash_state) {
-}
-
-Value* ItemInterruptedParameters::ToValue() const {
-  DictionaryValue* dict = new DictionaryValue();
-
-  dict->SetString("interrupt_reason", InterruptReasonDebugString(reason_));
-  dict->SetString("bytes_so_far", base::Int64ToString(bytes_so_far_));
+  dict->SetString("interrupt_reason", InterruptReasonDebugString(reason));
+  dict->SetString("bytes_so_far", base::Int64ToString(bytes_so_far));
   dict->SetString("hash_state",
-                  base::HexEncode(hash_state_.data(), hash_state_.size()));
+                  base::HexEncode(hash_state->data(), hash_state->size()));
 
   return dict;
 }
 
-ItemInterruptedParameters::~ItemInterruptedParameters() {}
-
-ItemFinishedParameters::ItemFinishedParameters(
-    int64 bytes_so_far,
-    const std::string& final_hash)
-        : bytes_so_far_(bytes_so_far),
-          final_hash_(final_hash) {
-}
-
-Value* ItemFinishedParameters::ToValue() const {
+base::Value* ItemFinishedCallback(int64 bytes_so_far,
+                                  const std::string* final_hash,
+                                  net::NetLog::LogLevel /* log_level */) {
   DictionaryValue* dict = new DictionaryValue();
 
-  dict->SetString("bytes_so_far", base::Int64ToString(bytes_so_far_));
+  dict->SetString("bytes_so_far", base::Int64ToString(bytes_so_far));
   dict->SetString("final_hash",
-                  base::HexEncode(final_hash_.data(), final_hash_.size()));
+                  base::HexEncode(final_hash->data(), final_hash->size()));
 
   return dict;
 }
 
-ItemFinishedParameters::~ItemFinishedParameters() {}
-
-ItemCanceledParameters::ItemCanceledParameters(
-    int64 bytes_so_far,
-    const std::string& hash_state)
-        : bytes_so_far_(bytes_so_far),
-          hash_state_(hash_state) {
-}
-
-Value* ItemCanceledParameters::ToValue() const {
+base::Value* ItemCanceledCallback(int64 bytes_so_far,
+                                  const std::string* hash_state,
+                                  net::NetLog::LogLevel /* log_level */) {
   DictionaryValue* dict = new DictionaryValue();
 
-  dict->SetString("bytes_so_far", base::Int64ToString(bytes_so_far_));
+  dict->SetString("bytes_so_far", base::Int64ToString(bytes_so_far));
   dict->SetString("hash_state",
-                  base::HexEncode(hash_state_.data(), hash_state_.size()));
+                  base::HexEncode(hash_state->data(), hash_state->size()));
 
   return dict;
 }
 
-ItemCanceledParameters::~ItemCanceledParameters() {}
-
-FileOpenedParameters::FileOpenedParameters(const std::string& file_name,
-                                           int64 start_offset)
-    : file_name_(file_name), start_offset_(start_offset) {
-}
-
-Value* FileOpenedParameters::ToValue() const {
+base::Value* FileOpenedCallback(const FilePath* file_name,
+                                int64 start_offset,
+                                net::NetLog::LogLevel /* log_level */) {
   DictionaryValue* dict = new DictionaryValue();
 
-  dict->SetString("file_name", file_name_);
-  dict->SetString("start_offset", base::Int64ToString(start_offset_));
+  dict->SetString("file_name", file_name->AsUTF8Unsafe());
+  dict->SetString("start_offset", base::Int64ToString(start_offset));
 
   return dict;
 }
 
-FileOpenedParameters::~FileOpenedParameters() {}
-
-FileStreamDrainedParameters::FileStreamDrainedParameters(
-    size_t stream_size, size_t num_buffers)
-    : stream_size_(stream_size), num_buffers_(num_buffers) {
-}
-
-Value* FileStreamDrainedParameters::ToValue() const {
+base::Value* FileStreamDrainedCallback(size_t stream_size,
+                                       size_t num_buffers,
+                                       net::NetLog::LogLevel /* log_level */) {
   DictionaryValue* dict = new DictionaryValue();
 
-  dict->SetInteger("stream_size", static_cast<int>(stream_size_));
-  dict->SetInteger("num_buffers", static_cast<int>(num_buffers_));
+  dict->SetInteger("stream_size", static_cast<int>(stream_size));
+  dict->SetInteger("num_buffers", static_cast<int>(num_buffers));
 
   return dict;
 }
 
-FileStreamDrainedParameters::~FileStreamDrainedParameters() { }
-
-FileRenamedParameters::FileRenamedParameters(
-    const std::string& old_filename, const std::string& new_filename)
-        : old_filename_(old_filename), new_filename_(new_filename) {
-}
-
-Value* FileRenamedParameters::ToValue() const {
+base::Value* FileRenamedCallback(const FilePath* old_filename,
+                                 const FilePath* new_filename,
+                                 net::NetLog::LogLevel /* log_level */) {
   DictionaryValue* dict = new DictionaryValue();
 
-  dict->SetString("old_filename", old_filename_);
-  dict->SetString("new_filename", new_filename_);
+  dict->SetString("old_filename", old_filename->AsUTF8Unsafe());
+  dict->SetString("new_filename", new_filename->AsUTF8Unsafe());
 
   return dict;
 }
 
-FileRenamedParameters::~FileRenamedParameters() {}
-
-FileErrorParameters::FileErrorParameters(const std::string& operation,
-                                         net::Error net_error)
-    : operation_(operation), net_error_(net_error) {
-}
-
-Value* FileErrorParameters::ToValue() const {
+base::Value* FileErrorCallback(const char* operation,
+                               net::Error net_error,
+                               net::NetLog::LogLevel /* log_level */) {
   DictionaryValue* dict = new DictionaryValue();
 
-  dict->SetString("operation", operation_);
-  dict->SetInteger("net_error", net_error_);
+  dict->SetString("operation", operation);
+  dict->SetInteger("net_error", net_error);
 
   return dict;
 }
 
-FileErrorParameters::~FileErrorParameters() {}
-
 }  // namespace download_net_logs