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

chrome/browser/ui/webui/chromeos/login/signin_screen_handler.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/ui/webui/chromeos/login/signin_screen_handler.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 206 matching lines @@
 
 bool IsSigninScreenError(ErrorScreen::ErrorState error_state) {
   return error_state == ErrorScreen::ERROR_STATE_PORTAL ||
       error_state == ErrorScreen::ERROR_STATE_OFFLINE ||
       error_state == ErrorScreen::ERROR_STATE_PROXY ||
       error_state == ErrorScreen::ERROR_STATE_AUTH_EXT_TIMEOUT;
 }
 
 // Returns network name by service path.
 std::string GetNetworkName(const std::string& service_path) {
-  const NetworkState* network =
-      NetworkStateHandler::Get()->GetNetworkState(service_path);
+  const NetworkState* network = NetworkHandler::Get()->network_state_handler()->
+      GetNetworkState(service_path);
   if (!network)
     return std::string();
   return network->name();
 }
 
 // Returns network unique id by service path.
 std::string GetNetworkUniqueId(const std::string& service_path) {
-  const NetworkState* network =
-      NetworkStateHandler::Get()->GetNetworkState(service_path);
+  const NetworkState* network = NetworkHandler::Get()->network_state_handler()->
+      GetNetworkState(service_path);
   if (!network)
     return std::string();
   return network->guid();
 }
 
 // Returns captive portal state for a network by its service path.
 NetworkPortalDetector::CaptivePortalState GetCaptivePortalState(
     const std::string& service_path) {
   NetworkPortalDetector* detector = NetworkPortalDetector::GetInstance();
-  const NetworkState* network =
-      NetworkStateHandler::Get()->GetNetworkState(service_path);
+  const NetworkState* network = NetworkHandler::Get()->network_state_handler()->
+      GetNetworkState(service_path);
   if (!detector || !network)
     return NetworkPortalDetector::CaptivePortalState();
   return detector->GetCaptivePortalState(network);
 }
 
 void RecordDiscrepancyWithShill(
     const NetworkState* network,
     const NetworkPortalDetector::CaptivePortalStatus status) {
   if (network->connection_state() == flimflam::kStateOnline) {
     UMA_HISTOGRAM_ENUMERATION(
@@ skipping 10 matching lines @@
         "CaptivePortal.OOBE.DiscrepancyWithShill_Offline",
         status,
         NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_COUNT);
   }
 }
 
 // Record state and descripancies with shill (e.g. shill thinks that
 // network is online but NetworkPortalDetector claims that it's behind
 // portal) for the network identified by |service_path|.
 void RecordNetworkPortalDetectorStats(const std::string& service_path) {
-  const NetworkState* network =
-      NetworkStateHandler::Get()->GetNetworkState(service_path);
+  const NetworkState* network = NetworkHandler::Get()->network_state_handler()->
+      GetNetworkState(service_path);
   if (!network)
     return;
   NetworkPortalDetector::CaptivePortalState state =
       GetCaptivePortalState(service_path);
   if (state.status == NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_UNKNOWN)
     return;
 
   UMA_HISTOGRAM_ENUMERATION("CaptivePortal.OOBE.DetectionResult",
                             state.status,
                             NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_COUNT);
@@ skipping 1298 matching lines @@
   if (!cros_settings)
     return false;
 
   // Offline login is allowed only when user pods are hidden.
   bool show_pods;
   cros_settings->GetBoolean(kAccountsPrefShowUserNamesOnSignIn, &show_pods);
   return !show_pods;
 }
 
 }  // namespace chromeos