Adding a new ManagedNetworkConfigurationHandler.

chromeos/network/network_configuration_handler.cc

Index: chromeos/network/network_configuration_handler.cc
diff --git a/chromeos/network/network_configuration_handler.cc b/chromeos/network/network_configuration_handler.cc
index 23b73f581f041eabd6e296dc3cc6390fae8c471c..17c691fe0969784ea274a9e8a8e585dc6b5c0517 100644
--- a/chromeos/network/network_configuration_handler.cc
+++ b/chromeos/network/network_configuration_handler.cc
@@ -20,12 +20,12 @@
 
 namespace chromeos {
 
-static NetworkConfigurationHandler* g_network_configuration_handler = NULL;
-
 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";
@@ -60,7 +60,7 @@ void ClearPropertiesCallback(
         network_handler::CreateErrorData(service_path,
                                          kClearPropertiesFailedError,
                                          kClearPropertiesFailedErrorMessage));
-    LOG(ERROR) << "ClearPropertiesCallback Failed for service path: "
+    LOG(ERROR) << "ClearPropertiesCallback failed for service path: "
                << service_path;
     error_data->Set("errors", result.DeepCopy());
     scoped_ptr<base::ListValue> name_list(new base::ListValue);
@@ -85,7 +85,7 @@ void RunCallbackWithDictionaryValue(
         network_handler::CreateErrorData(service_path,
                                          kDBusFailedError,
                                          kDBusFailedErrorMessage));
-    LOG(ERROR) << "CallbackWithDictionaryValue Failed for service path: "
+    LOG(ERROR) << "CallbackWithDictionaryValue failed for service path: "
                << service_path;
     error_callback.Run(kDBusFailedError, error_data.Pass());
   } else {
@@ -106,30 +106,24 @@ void IgnoreObjectPathCallback(const base::Closure& callback,
 
 }  // namespace
 
-NetworkConfigurationHandler::NetworkConfigurationHandler() {
-}
-
-NetworkConfigurationHandler::~NetworkConfigurationHandler() {
-}
-
 // static
 void NetworkConfigurationHandler::Initialize() {
-  CHECK(!g_network_configuration_handler);
-  g_network_configuration_handler = new NetworkConfigurationHandler();
+  CHECK(!g_configuration_handler_instance);
+  g_configuration_handler_instance = new NetworkConfigurationHandler;
 }
 
 // static
 void NetworkConfigurationHandler::Shutdown() {
-  CHECK(g_network_configuration_handler);
-  delete g_network_configuration_handler;
-  g_network_configuration_handler = NULL;
+  CHECK(g_configuration_handler_instance);
+  delete g_configuration_handler_instance;
+  g_configuration_handler_instance = NULL;
 }
 
 // static
 NetworkConfigurationHandler* NetworkConfigurationHandler::Get() {
-  CHECK(g_network_configuration_handler)
+  CHECK(g_configuration_handler_instance)
       << "NetworkConfigurationHandler::Get() called before Initialize()";
-  return g_network_configuration_handler;
+  return g_configuration_handler_instance;
 }
 
 void NetworkConfigurationHandler::GetProperties(
@@ -217,4 +211,10 @@ void NetworkConfigurationHandler::RemoveConfiguration(
                  kLogModule, service_path, error_callback));
 }
 
+NetworkConfigurationHandler::NetworkConfigurationHandler() {
+}
+
+NetworkConfigurationHandler::~NetworkConfigurationHandler() {
+}
+
 }  // namespace chromeos