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

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 22a8998b43837661b60129698523f019abbf32c6..bd5366a30d6e57e7c4689ff65826b6cd9a9317ab 100644
--- a/chromeos/network/network_configuration_handler.cc
+++ b/chromeos/network/network_configuration_handler.cc
@@ -23,8 +23,6 @@ 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";
@@ -105,26 +103,6 @@ void IgnoreObjectPathCallback(const base::Closure& callback,
 
 }  // 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,
@@ -215,4 +193,9 @@ NetworkConfigurationHandler::NetworkConfigurationHandler() {
 NetworkConfigurationHandler::~NetworkConfigurationHandler() {
 }
 
+// static
+NetworkConfigurationHandler* NetworkConfigurationHandler::InitializeForTest() {
+  return new NetworkConfigurationHandler();
+}
+
 }  // namespace chromeos