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

chrome/browser/chromeos/extensions/networking_private_event_router.cc

 // Copyright (c) 2013 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 "chrome/browser/chromeos/extensions/networking_private_event_router.h"
 
 #include "base/json/json_writer.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/extensions/networking_private_api.h"
 #include "chrome/browser/extensions/event_names.h"
@@ skipping 39 matching lines @@
 
 void NetworkingPrivateEventRouter::Shutdown() {
   // Unregister with the event router. We first check and see if there *is* an
   // event router, because some unit tests try to shutdown all profile services,
   // but didn't initialize the event router first.
   EventRouter* event_router = ExtensionSystem::Get(profile_)->event_router();
   if (event_router)
     event_router->UnregisterObserver(this);
 
   if (listening_)
-    NetworkStateHandler::Get()->RemoveObserver(this);
+    NetworkHandler::Get()->network_state_handler()->RemoveObserver(this);
   listening_ = false;
 }
 
 void NetworkingPrivateEventRouter::OnListenerAdded(
     const extensions::EventListenerInfo& details) {
   // Start listening to events from the network state handler.
   StartOrStopListeningForNetworkChanges();
 }
 
 void NetworkingPrivateEventRouter::OnListenerRemoved(
     const extensions::EventListenerInfo& details) {
   // Stop listening to events from the network state handler if there are no
   // more listeners.
   StartOrStopListeningForNetworkChanges();
 }
 
 void NetworkingPrivateEventRouter::StartOrStopListeningForNetworkChanges() {
   EventRouter* event_router = ExtensionSystem::Get(profile_)->event_router();
   bool should_listen = event_router->HasEventListener(kOnNetworksChanged) ||
       event_router->HasEventListener(kOnNetworkListChanged);
 
   if (should_listen) {
     if (!listening_)
-      NetworkStateHandler::Get()->AddObserver(this);
+      NetworkHandler::Get()->network_state_handler()->AddObserver(this);
   } else {
     if (listening_)
-      NetworkStateHandler::Get()->RemoveObserver(this);
+      NetworkHandler::Get()->network_state_handler()->RemoveObserver(this);
   }
   listening_ = should_listen;
 }
 
 void NetworkingPrivateEventRouter::NetworkListChanged() {
   EventRouter* event_router = ExtensionSystem::Get(profile_)->event_router();
   NetworkStateList networks;
-  NetworkStateHandler::Get()->GetNetworkList(&networks);
+  NetworkHandler::Get()->network_state_handler()->GetNetworkList(&networks);
   if (!event_router->HasEventListener(kOnNetworkListChanged))
     return;
 
   std::vector<std::string> changes;
   for (NetworkStateList::const_iterator iter = networks.begin();
       iter != networks.end(); ++iter) {
     // TODO(gspencer): Currently the "GUID" is actually the service path. Fix
     // this to be the real GUID once we're using
     // ManagedNetworkConfigurationManager.
     changes.push_back((*iter)->path());
@@ skipping 12 matching lines @@
     return;
 
   scoped_ptr<base::ListValue> args(api::OnNetworksChanged::Create(
       std::vector<std::string>(1, network->path())));
   scoped_ptr<extensions::Event> extension_event(
       new extensions::Event(kOnNetworksChanged, args.Pass()));
   event_router->BroadcastEvent(extension_event.Pass());
 }
 
 }  // namespace chromeos