Adding a new ManagedNetworkConfigurationHandler.

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"
 
 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";
 const char kClearPropertiesFailedError[] = "Error.ClearPropertiesFailed";
 const char kClearPropertiesFailedErrorMessage[] = "Clear properties failed";
 const char kDBusFailedError[] = "Error.DBusFailed";
 const char kDBusFailedErrorMessage[] = "DBus call failed.";
 
 void ClearPropertiesCallback(
     const std::vector<std::string>& names,
@@ skipping 14 matching lines @@
     }
   }
 
   if (some_failed) {
     DCHECK(names.size() == result.GetSize())
         << "Result wrong size from ClearProperties.";
     scoped_ptr<base::DictionaryValue> error_data(
         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);
     name_list->AppendStrings(names);
     error_data->Set("names", name_list.release());
     error_callback.Run(kClearPropertiesFailedError, error_data.Pass());
   } else {
     callback.Run();
   }
 }
 
 // Used to translate the dbus dictionary callback into one that calls
 // the error callback if we have a failure.
 void RunCallbackWithDictionaryValue(
     const network_handler::DictionaryResultCallback& callback,
     const network_handler::ErrorCallback& error_callback,
     const std::string& service_path,
     DBusMethodCallStatus call_status,
     const base::DictionaryValue& value) {
   if (call_status != DBUS_METHOD_CALL_SUCCESS) {
     scoped_ptr<base::DictionaryValue> error_data(
         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 {
     callback.Run(service_path, value);
   }
 }
 
 void RunCreateNetworkCallback(
     const network_handler::StringResultCallback& callback,
     const dbus::ObjectPath& service_path) {
   callback.Run(service_path.value());
 }
 
 void IgnoreObjectPathCallback(const base::Closure& callback,
                               const dbus::ObjectPath& object_path) {
   callback.Run();
 }
 
 }  // 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(
     const std::string& service_path,
     const network_handler::DictionaryResultCallback& callback,
     const network_handler::ErrorCallback& error_callback) const {
   DBusThreadManager::Get()->GetShillServiceClient()->GetProperties(
       dbus::ObjectPath(service_path),
       base::Bind(&RunCallbackWithDictionaryValue,
                  callback,
@@ skipping 67 matching lines @@
     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));
 }
 
+NetworkConfigurationHandler::NetworkConfigurationHandler() {
+}
+
+NetworkConfigurationHandler::~NetworkConfigurationHandler() {
+}
+
 }  // namespace chromeos