Add NetworkHandler to own network handlers in src/chromeos/network

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 {
 
-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 60 matching lines @@
   callback.Run(service_path.value());
 }
 
 void IgnoreObjectPathCallback(const base::Closure& callback,
                               const dbus::ObjectPath& object_path) {
   callback.Run();
 }
 
 }  // namespace
 
-// static
-void NetworkConfigurationHandler::Initialize() {
-  CHECK(!g_configuration_handler_instance);
-  g_configuration_handler_instance = new NetworkConfigurationHandler;
-}
-
-// static
-void NetworkConfigurationHandler::Shutdown() {
-  CHECK(g_configuration_handler_instance);
-  delete g_configuration_handler_instance;
-  g_configuration_handler_instance = NULL;
-}
-
-// static
-NetworkConfigurationHandler* NetworkConfigurationHandler::Get() {
-  CHECK(g_configuration_handler_instance)
-      << "NetworkConfigurationHandler::Get() called before Initialize()";
-  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,
                  error_callback,
                  service_path));
@@ skipping 70 matching lines @@
       base::Bind(&network_handler::ShillErrorCallbackFunction,
                  service_path, error_callback));
 }
 
 NetworkConfigurationHandler::NetworkConfigurationHandler() {
 }
 
 NetworkConfigurationHandler::~NetworkConfigurationHandler() {
 }
 
+// static
+NetworkConfigurationHandler* NetworkConfigurationHandler::InitializeForTest() {
+  return new NetworkConfigurationHandler();
+}
+
 }  // namespace chromeos