| Index: chromeos/network/network_configuration_handler.cc
|
| diff --git a/chromeos/network/network_configuration_handler.cc b/chromeos/network/network_configuration_handler.cc
|
| index ee950d3cf327e890cbdf930275ca0c2be2cad74d..46bf22ccfa048b0e2b05c2102034b96773c2d342 100644
|
| --- a/chromeos/network/network_configuration_handler.cc
|
| +++ b/chromeos/network/network_configuration_handler.cc
|
| @@ -23,8 +23,6 @@ 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
|
| @@ -148,7 +146,7 @@ void NetworkConfigurationHandler::SetProperties(
|
| properties,
|
| base::Bind(&IgnoreObjectPathCallback, callback),
|
| base::Bind(&network_handler::ShillErrorCallbackFunction,
|
| - kLogModule, service_path, error_callback));
|
| + service_path, error_callback));
|
| }
|
|
|
| void NetworkConfigurationHandler::ClearProperties(
|
| @@ -165,7 +163,7 @@ void NetworkConfigurationHandler::ClearProperties(
|
| callback,
|
| error_callback),
|
| base::Bind(&network_handler::ShillErrorCallbackFunction,
|
| - kLogModule, service_path, error_callback));
|
| + service_path, error_callback));
|
| }
|
|
|
| void NetworkConfigurationHandler::Connect(
|
| @@ -176,7 +174,7 @@ void NetworkConfigurationHandler::Connect(
|
| dbus::ObjectPath(service_path),
|
| callback,
|
| base::Bind(&network_handler::ShillErrorCallbackFunction,
|
| - kLogModule, service_path, error_callback));
|
| + service_path, error_callback));
|
| }
|
|
|
| void NetworkConfigurationHandler::Disconnect(
|
| @@ -187,7 +185,7 @@ void NetworkConfigurationHandler::Disconnect(
|
| dbus::ObjectPath(service_path),
|
| callback,
|
| base::Bind(&network_handler::ShillErrorCallbackFunction,
|
| - kLogModule, service_path, error_callback));
|
| + service_path, error_callback));
|
| }
|
|
|
| void NetworkConfigurationHandler::CreateConfiguration(
|
| @@ -212,13 +210,13 @@ void NetworkConfigurationHandler::CreateConfiguration(
|
| 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));
|
| }
|
| }
|
|
|
| @@ -230,7 +228,7 @@ void NetworkConfigurationHandler::RemoveConfiguration(
|
| dbus::ObjectPath(service_path),
|
| callback,
|
| base::Bind(&network_handler::ShillErrorCallbackFunction,
|
| - kLogModule, service_path, error_callback));
|
| + service_path, error_callback));
|
| }
|
|
|
| NetworkConfigurationHandler::NetworkConfigurationHandler() {
|
|
|