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

chrome/browser/ui/webui/chromeos/login/network_state_informer.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 "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
@@ skipping 11 matching lines @@
 }  // namespace
 
 namespace chromeos {
 
 NetworkStateInformer::NetworkStateInformer()
     : state_(OFFLINE),
       delegate_(NULL) {
 }
 
 NetworkStateInformer::~NetworkStateInformer() {
-  NetworkStateHandler::Get()->RemoveObserver(this);
+  if (NetworkHandler::IsInitialized())
+    NetworkHandler::Get()->network_state_handler()->RemoveObserver(this);
   if (NetworkPortalDetector::IsEnabledInCommandLine() &&
       NetworkPortalDetector::GetInstance()) {
     NetworkPortalDetector::GetInstance()->RemoveObserver(this);
   }
 }
 
 void NetworkStateInformer::Init() {
   UpdateState();
-  NetworkStateHandler::Get()->AddObserver(this);
+  NetworkHandler::Get()->network_state_handler()->AddObserver(this);
 
   if (NetworkPortalDetector::IsEnabledInCommandLine() &&
       NetworkPortalDetector::GetInstance()) {
     NetworkPortalDetector::GetInstance()->AddAndFireObserver(this);
   }
 
   registrar_.Add(this,
                  chrome::NOTIFICATION_LOGIN_PROXY_CHANGED,
                  content::NotificationService::AllSources());
   registrar_.Add(this,
@@ skipping 10 matching lines @@
     observers_.AddObserver(observer);
 }
 
 void NetworkStateInformer::RemoveObserver(
     NetworkStateInformerObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void NetworkStateInformer::NetworkManagerChanged() {
   const NetworkState* default_network =
-      NetworkStateHandler::Get()->DefaultNetwork();
+      NetworkHandler::Get()->network_state_handler()->DefaultNetwork();
   State new_state = OFFLINE;
   std::string new_network_service_path;
   if (default_network) {
     new_state = GetNetworkState(default_network);
     new_network_service_path = default_network->path();
   }
   if ((state_ != ONLINE && (new_state == ONLINE || new_state == CONNECTING)) ||
       (state_ == ONLINE && (new_state == ONLINE || new_state == CONNECTING) &&
        new_network_service_path != last_online_service_path_) ||
       (new_state == CAPTIVE_PORTAL &&
@@ skipping 18 matching lines @@
   }
 }
 
 void NetworkStateInformer::DefaultNetworkChanged(const NetworkState* network) {
   NetworkManagerChanged();
 }
 
 void NetworkStateInformer::OnPortalDetectionCompleted(
     const NetworkState* network,
     const NetworkPortalDetector::CaptivePortalState& state) {
-  if (NetworkStateHandler::IsInitialized() &&
-      NetworkStateHandler::Get()->DefaultNetwork() == network)
+  if (NetworkHandler::IsInitialized() &&
+      NetworkHandler::Get()->network_state_handler()->DefaultNetwork() ==
+      network)
     NetworkManagerChanged();
 }
 
 void NetworkStateInformer::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_SESSION_STARTED)
     registrar_.RemoveAll();
   else if (type == chrome::NOTIFICATION_LOGIN_PROXY_CHANGED)
     SendStateToObservers(ErrorScreenActor::ERROR_REASON_PROXY_CONFIG_CHANGED);
   else
     NOTREACHED() << "Unknown notification: " << type;
 }
 
 void NetworkStateInformer::OnPortalDetected() {
   SendStateToObservers(ErrorScreenActor::ERROR_REASON_PORTAL_DETECTED);
 }
 
 bool NetworkStateInformer::UpdateState() {
   State new_state = OFFLINE;
 
   const NetworkState* default_network =
-      NetworkStateHandler::Get()->DefaultNetwork();
+      NetworkHandler::Get()->network_state_handler()->DefaultNetwork();
   if (default_network) {
     new_state = GetNetworkState(default_network);
     last_network_service_path_ = default_network->path();
     last_network_type_ = default_network->type();
   }
 
   bool updated = (new_state != state_) ||
       (new_state != OFFLINE &&
        last_network_service_path_ != last_connected_service_path_);
   state_ = new_state;
@@ skipping 74 matching lines @@
   if (!ProxyConfigServiceImpl::ParseProxyConfig(network->proxy_config(),
                                                 &proxy_config))
     return false;
   bool configured = !proxy_config.proxy_rules().empty();
   proxy_state_map_[network->guid()] =
       ProxyState(network->proxy_config(), configured);
   return configured;
 }
 
 }  // namespace chromeos