Re-factor network_event_log

chromeos/network/network_configuration_handler.cc

 // Copyright (c) 2012 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 "chromeos/network/network_configuration_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "chromeos/dbus/dbus_method_call_status.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/shill_manager_client.h"
 #include "chromeos/dbus/shill_service_client.h"
 #include "dbus/object_path.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 namespace {
 
-const char kLogModule[] = "NetworkConfigurationHandler";
-
 NetworkConfigurationHandler* g_configuration_handler_instance = NULL;
 
 // None of these error messages are user-facing: they should only appear in
 // logs.
 const char kErrorsListTag[] = "errors";
 const char kClearPropertiesFailedError[] = "Error.ClearPropertiesFailed";
 const char kClearPropertiesFailedErrorMessage[] = "Clear properties failed";
 const char kDBusFailedError[] = "Error.DBusFailed";
 const char kDBusFailedErrorMessage[] = "DBus call failed.";
 
@@ skipping 103 matching lines @@
 
 void NetworkConfigurationHandler::SetProperties(
     const std::string& service_path,
     const base::DictionaryValue& properties,
     const base::Closure& callback,
     const network_handler::ErrorCallback& error_callback) const {
   DBusThreadManager::Get()->GetShillManagerClient()->ConfigureService(
       properties,
       base::Bind(&IgnoreObjectPathCallback, callback),
       base::Bind(&network_handler::ShillErrorCallbackFunction,
-                 kLogModule, service_path, error_callback));
+                 service_path, error_callback));
 }
 
 void NetworkConfigurationHandler::ClearProperties(
     const std::string& service_path,
     const std::vector<std::string>& names,
     const base::Closure& callback,
     const network_handler::ErrorCallback& error_callback) {
   DBusThreadManager::Get()->GetShillServiceClient()->ClearProperties(
       dbus::ObjectPath(service_path),
       names,
       base::Bind(&ClearPropertiesCallback,
                  names,
                  service_path,
                  callback,
                  error_callback),
       base::Bind(&network_handler::ShillErrorCallbackFunction,
-                 kLogModule, service_path, error_callback));
+                 service_path, error_callback));
 }
 
 void NetworkConfigurationHandler::Connect(
     const std::string& service_path,
     const base::Closure& callback,
     const network_handler::ErrorCallback& error_callback) const {
   DBusThreadManager::Get()->GetShillServiceClient()->Connect(
       dbus::ObjectPath(service_path),
       callback,
       base::Bind(&network_handler::ShillErrorCallbackFunction,
-                 kLogModule, service_path, error_callback));
+                 service_path, error_callback));
 }
 
 void NetworkConfigurationHandler::Disconnect(
     const std::string& service_path,
     const base::Closure& callback,
     const network_handler::ErrorCallback& error_callback) const {
   DBusThreadManager::Get()->GetShillServiceClient()->Disconnect(
       dbus::ObjectPath(service_path),
       callback,
       base::Bind(&network_handler::ShillErrorCallbackFunction,
-                 kLogModule, service_path, error_callback));
+                 service_path, error_callback));
 }
 
 void NetworkConfigurationHandler::CreateConfiguration(
     const base::DictionaryValue& properties,
     const network_handler::StringResultCallback& callback,
     const network_handler::ErrorCallback& error_callback) const {
   ShillManagerClient* manager =
       DBusThreadManager::Get()->GetShillManagerClient();
 
   std::string type;
   properties.GetStringWithoutPathExpansion(flimflam::kTypeProperty, &type);
   // Shill supports ConfigureServiceForProfile only for network type WiFi. In
   // all other cases, we have to rely on GetService for now. This is
   // unproblematic for VPN (user profile only), but will lead to inconsistencies
   // with WiMax, for example.
   if (type == flimflam::kTypeWifi) {
     std::string profile;
     properties.GetStringWithoutPathExpansion(flimflam::kProfileProperty,
                                              &profile);
     manager->ConfigureServiceForProfile(
         dbus::ObjectPath(profile),
         properties,
         base::Bind(&RunCreateNetworkCallback, callback),
         base::Bind(&network_handler::ShillErrorCallbackFunction,
-                   kLogModule, "", error_callback));
+                   "", error_callback));
   } else {
     manager->GetService(
         properties,
         base::Bind(&RunCreateNetworkCallback, callback),
         base::Bind(&network_handler::ShillErrorCallbackFunction,
-                   kLogModule, "", error_callback));
+                   "", error_callback));
   }
 }
 
 void NetworkConfigurationHandler::RemoveConfiguration(
     const std::string& service_path,
     const base::Closure& callback,
     const network_handler::ErrorCallback& error_callback) const {
   DBusThreadManager::Get()->GetShillServiceClient()->Remove(
       dbus::ObjectPath(service_path),
       callback,
       base::Bind(&network_handler::ShillErrorCallbackFunction,
-                 kLogModule, service_path, error_callback));
+                 service_path, error_callback));
 }
 
 NetworkConfigurationHandler::NetworkConfigurationHandler() {
 }
 
 NetworkConfigurationHandler::~NetworkConfigurationHandler() {
 }
 
 }  // namespace chromeos