Re-factor network_event_log

chromeos/network/network_handler_callbacks.cc

Index: chromeos/network/network_handler_callbacks.cc
diff --git a/chromeos/network/network_handler_callbacks.cc b/chromeos/network/network_handler_callbacks.cc
index f10a12f1d825b342d1664b6679d4185ca2a4b8a4..597b8bd9f71d4f944f6706260980e7b974eb8ce4 100644
--- a/chromeos/network/network_handler_callbacks.cc
+++ b/chromeos/network/network_handler_callbacks.cc
@@ -11,8 +11,6 @@
 namespace chromeos {
 namespace network_handler {
 
-const char kLogModule[] = "ShillError";
-
 // These are names of fields in the error data dictionary for ErrorCallback.
 const char kErrorName[] = "errorName";
 const char kErrorMessage[] = "errorMessage";
@@ -29,17 +27,16 @@ base::DictionaryValue* CreateErrorData(const std::string& service_path,
   return error_data;
 }
 
-void ShillErrorCallbackFunction(const std::string& module,
-                                const std::string& path,
+void ShillErrorCallbackFunction(const std::string& path,
                                 const ErrorCallback& error_callback,
                                 const std::string& error_name,
                                 const std::string& error_message) {
-  std::string error = "Shill Error in " + module;
+  std::string error = "Shill Error";
   if (!path.empty())
     error += " For " + path;
-  error += ": " + error_name + " : " + error_message;
-  LOG(ERROR) << error;
-  network_event_log::AddEntry(kLogModule, module, error);
+  error += ": " + error_name;
+  NET_LOG_ERROR(error, error_message);
+  LOG(ERROR) << error << " : " << error_message;
   if (error_callback.is_null())
     return;
   scoped_ptr<base::DictionaryValue> error_data(