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

chromeos/network/network_state_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_state_handler.h"
 
 #include "base/bind.h"
 #include "base/format_macros.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
@@ skipping 53 matching lines @@
 
 }  // namespace
 
 namespace chromeos {
 
 const char NetworkStateHandler::kMatchTypeDefault[] = "default";
 const char NetworkStateHandler::kMatchTypeWireless[] = "wireless";
 const char NetworkStateHandler::kMatchTypeMobile[] = "mobile";
 const char NetworkStateHandler::kMatchTypeNonVirtual[] = "non-virtual";
 
-static NetworkStateHandler* g_network_state_handler = NULL;
-
 NetworkStateHandler::NetworkStateHandler() {
 }
 
 NetworkStateHandler::~NetworkStateHandler() {
   STLDeleteContainerPointers(network_list_.begin(), network_list_.end());
   STLDeleteContainerPointers(device_list_.begin(), device_list_.end());
 }
 
 void NetworkStateHandler::InitShillPropertyHandler() {
   shill_property_handler_.reset(new internal::ShillPropertyHandler(this));
   shill_property_handler_->Init();
 }
 
 // static
-void NetworkStateHandler::Initialize() {
-  CHECK(!g_network_state_handler);
-  g_network_state_handler = new NetworkStateHandler();
-  g_network_state_handler->InitShillPropertyHandler();
-}
-
-// static
-bool NetworkStateHandler::IsInitialized() {
-  return g_network_state_handler != NULL;
-}
-
-// static
-void NetworkStateHandler::Shutdown() {
-  CHECK(g_network_state_handler);
-  delete g_network_state_handler;
-  g_network_state_handler = NULL;
-}
-
-// static
-NetworkStateHandler* NetworkStateHandler::Get() {
-  CHECK(g_network_state_handler)
-      << "NetworkStateHandler::Get() called before Initialize()";
-  return g_network_state_handler;
+NetworkStateHandler* NetworkStateHandler::InitializeForTest() {
+  NetworkStateHandler* handler = new NetworkStateHandler();
+  handler->InitShillPropertyHandler();
+  return handler;
 }
 
 void NetworkStateHandler::AddObserver(NetworkStateHandlerObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void NetworkStateHandler::RemoveObserver(
     NetworkStateHandlerObserver* observer) {
   observers_.RemoveObserver(observer);
 }
@@ skipping 477 matching lines @@
   }
   if (type == kMatchTypeDefault || type == kMatchTypeNonVirtual ||
       type == kMatchTypeWireless) {
     NOTREACHED();
     return flimflam::kTypeWifi;
   }
   return type;
 }
 
 }  // namespace chromeos