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

ash/system/chromeos/network/tray_network.cc

Index: ash/system/chromeos/network/tray_network.cc
diff --git a/ash/system/chromeos/network/tray_network.cc b/ash/system/chromeos/network/tray_network.cc
index b5731ad3f5372b954a860b8b89a002c930d23abe..7bca060c0f02218de0b015358d0bf2250eef2324 100644
--- a/ash/system/chromeos/network/tray_network.cc
+++ b/ash/system/chromeos/network/tray_network.cc
@@ -38,6 +38,7 @@
 
 using ash::internal::TrayNetwork;
 using ash::NetworkObserver;
+using chromeos::NetworkHandler;
 using chromeos::NetworkState;
 using chromeos::NetworkStateHandler;
 
@@ -64,8 +65,7 @@ int GetMessageIcon(NetworkObserver::MessageType message_type,
 
 bool UseNewNetworkHandlers() {
   return !CommandLine::ForCurrentProcess()->HasSwitch(
-      ash::switches::kAshDisableNewNetworkStatusArea) &&
-      NetworkStateHandler::IsInitialized();
+      ash::switches::kAshDisableNewNetworkStatusArea);
 }
 
 }  // namespace
@@ -144,7 +144,8 @@ class NetworkTrayView : public TrayItemView,
 
   void UpdateNetworkStateHandlerIcon() {
     DCHECK(UseNewNetworkHandlers());
-    NetworkStateHandler* handler = NetworkStateHandler::Get();
+    NetworkStateHandler* handler =
+        NetworkHandler::Get()->network_state_handler();
     gfx::ImageSkia image;
     base::string16 name;
     bool animating = false;
@@ -421,10 +422,10 @@ TrayNetwork::TrayNetwork(SystemTray* system_tray)
       notification_(NULL),
       messages_(new tray::NetworkMessages()),
       request_wifi_view_(false) {
-  if (UseNewNetworkHandlers())
+  if (UseNewNetworkHandlers()) {
     network_state_observer_.reset(new TrayNetworkStateObserver(this));
-  if (NetworkStateHandler::IsInitialized())
     network_state_notifier_.reset(new NetworkStateNotifier());
+  }
   Shell::GetInstance()->system_tray_notifier()->AddNetworkObserver(this);
 }
 
@@ -571,7 +572,7 @@ void TrayNetwork::GetNetworkStateHandlerImageAndLabel(
     gfx::ImageSkia* image,
     base::string16* label,
     bool* animating) {
-  NetworkStateHandler* handler = NetworkStateHandler::Get();
+  NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
   const NetworkState* connected_network = handler->ConnectedNetworkByType(
       NetworkStateHandler::kMatchTypeNonVirtual);
   const NetworkState* connecting_network = handler->ConnectingNetworkByType(