Re-factor network_event_log

chromeos/network/network_state.cc

Index: chromeos/network/network_state.cc
diff --git a/chromeos/network/network_state.cc b/chromeos/network/network_state.cc
index 3aa0472174b3f2ed729e632706b11bd27498982d..83b5858b63bda0f5fe51e7f1a97a8e3a9b38912c 100644
--- a/chromeos/network/network_state.cc
+++ b/chromeos/network/network_state.cc
@@ -16,8 +16,6 @@
 
 namespace {
 
-const char kLogModule[] = "NetworkState";
-
 bool ConvertListValueToStringVector(const base::ListValue& string_list,
                                     std::vector<std::string>* result) {
   for (size_t i = 0; i < string_list.GetSize(); ++i) {
@@ -186,9 +184,8 @@ void NetworkState::UpdateName() {
     std::string valid_ssid = ValidateUTF8(name());
     if (valid_ssid != name()) {
       set_name(valid_ssid);
-      network_event_log::AddEntry(
-          kLogModule, "UpdateName",
-          base::StringPrintf("%s: UTF8: %s", path().c_str(), name().c_str()));
+      NET_LOG_DEBUG("UpdateName", base::StringPrintf(
+          "%s: UTF8: %s", path().c_str(), name().c_str()));
     }
     return;
   }
@@ -200,7 +197,7 @@ void NetworkState::UpdateName() {
   } else {
     std::string desc = base::StringPrintf("%s: Error processing: %s",
                                           path().c_str(), hex_ssid_.c_str());
-    network_event_log::AddEntry(kLogModule, "UpdateName", desc);
+    NET_LOG_DEBUG("UpdateName", desc);
     LOG(ERROR) << desc;
     ssid = name();
   }
@@ -208,9 +205,8 @@ void NetworkState::UpdateName() {
   if (IsStringUTF8(ssid)) {
     if (ssid != name()) {
       set_name(ssid);
-      network_event_log::AddEntry(
-          kLogModule, "UpdateName",
-          base::StringPrintf("%s: UTF8: %s", path().c_str(), name().c_str()));
+      NET_LOG_DEBUG("UpdateName", base::StringPrintf(
+          "%s: UTF8: %s", path().c_str(), name().c_str()));
     }
     return;
   }
@@ -226,10 +222,9 @@ void NetworkState::UpdateName() {
     std::string utf8_ssid;
     if (base::ConvertToUtf8AndNormalize(ssid, encoding, &utf8_ssid)) {
       set_name(utf8_ssid);
-      network_event_log::AddEntry(
-          kLogModule, "UpdateName",
-          base::StringPrintf("%s: Encoding=%s: %s", path().c_str(),
-                             encoding.c_str(), name().c_str()));
+      NET_LOG_DEBUG("UpdateName", base::StringPrintf(
+          "%s: Encoding=%s: %s", path().c_str(),
+          encoding.c_str(), name().c_str()));
       return;
     }
   }
@@ -237,10 +232,9 @@ void NetworkState::UpdateName() {
   // Unrecognized encoding. Only use raw bytes if name_ is empty.
   if (name().empty())
     set_name(ssid);
-  network_event_log::AddEntry(
-      kLogModule, "UpdateName",
-      base::StringPrintf("%s: Unrecognized Encoding=%s: %s", path().c_str(),
-                         encoding.c_str(), name().c_str()));
+  NET_LOG_DEBUG("UpdateName", base::StringPrintf(
+      "%s: Unrecognized Encoding=%s: %s", path().c_str(),
+      encoding.c_str(), name().c_str()));
 }
 
 // static