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

ash/system/chromeos/network/network_state_list_detailed_view.cc

Index: ash/system/chromeos/network/network_state_list_detailed_view.cc
diff --git a/ash/system/chromeos/network/network_state_list_detailed_view.cc b/ash/system/chromeos/network/network_state_list_detailed_view.cc
index 9ba3849ab179bfb9b257cd3a3542edd429cd03e3..a203b8fd3b98e13d19e15dec3f6b9f0ff0b1267b 100644
--- a/ash/system/chromeos/network/network_state_list_detailed_view.cc
+++ b/ash/system/chromeos/network/network_state_list_detailed_view.cc
@@ -40,9 +40,8 @@
 #include "ui/views/widget/widget.h"
 
 using chromeos::DeviceState;
+using chromeos::NetworkHandler;
 using chromeos::NetworkState;
-using chromeos::NetworkStateHandler;
-using chromeos::NetworkConnectionHandler;
 
 namespace ash {
 namespace internal {
@@ -169,7 +168,7 @@ void NetworkStateListDetailedView::ManagerChanged() {
 
 void NetworkStateListDetailedView::NetworkListChanged() {
   NetworkStateList network_list;
-  NetworkStateHandler::Get()->GetNetworkList(&network_list);
+  NetworkHandler::Get()->network_state_handler()->GetNetworkList(&network_list);
   UpdateNetworks(network_list);
   UpdateNetworkList();
   UpdateHeaderButtons();
@@ -197,7 +196,7 @@ void NetworkStateListDetailedView::Init() {
   CreateHeaderButtons();
 
   NetworkStateList network_list;
-  NetworkStateHandler::Get()->GetNetworkList(&network_list);
+  NetworkHandler::Get()->network_state_handler()->GetNetworkList(&network_list);
   UpdateNetworks(network_list);
   UpdateNetworkList();
   UpdateHeaderButtons();
@@ -222,7 +221,7 @@ void NetworkStateListDetailedView::ButtonPressed(views::Button* sender,
   // If the info bubble was visible, close it when some other item is clicked.
   ResetInfoBubble();
 
-  NetworkStateHandler* handler = NetworkStateHandler::Get();
+  NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
   ash::SystemTrayDelegate* delegate =
       ash::Shell::GetInstance()->system_tray_delegate();
   if (sender == button_wifi_) {
@@ -362,7 +361,7 @@ void NetworkStateListDetailedView::CreateNetworkExtra() {
 // Update UI components.
 
 void NetworkStateListDetailedView::UpdateHeaderButtons() {
-  NetworkStateHandler* handler = NetworkStateHandler::Get();
+  NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
   if (button_wifi_)
     UpdateTechnologyButton(button_wifi_, flimflam::kTypeWifi);
   if (button_mobile_) {
@@ -379,7 +378,8 @@ void NetworkStateListDetailedView::UpdateTechnologyButton(
     TrayPopupHeaderButton* button,
     const std::string& technology) {
   NetworkStateHandler::TechnologyState state =
-      NetworkStateHandler::Get()->GetTechnologyState(technology);
+      NetworkHandler::Get()->network_state_handler()->
+      GetTechnologyState(technology);
   if (state == NetworkStateHandler::TECHNOLOGY_UNAVAILABLE) {
     button->SetVisible(false);
     return;
@@ -417,7 +417,7 @@ void NetworkStateListDetailedView::UpdateNetworks(
 }
 
 void NetworkStateListDetailedView::UpdateNetworkList() {
-  NetworkStateHandler* handler = NetworkStateHandler::Get();
+  NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
 
   // First, update state for all networks
   bool animating = false;
@@ -536,7 +536,7 @@ bool NetworkStateListDetailedView::UpdateNetworkListEntries(
     std::set<std::string>* new_service_paths) {
   bool needs_relayout = false;
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  NetworkStateHandler* handler = NetworkStateHandler::Get();
+  NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
 
   // Insert child views
   int index = 0;
@@ -625,7 +625,7 @@ void NetworkStateListDetailedView::UpdateNetworkExtra() {
     return;
 
   View* layout_parent = NULL;  // All these buttons have the same parent.
-  NetworkStateHandler* handler = NetworkStateHandler::Get();
+  NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
   if (other_wifi_) {
     DCHECK(turn_on_wifi_);
     NetworkStateHandler::TechnologyState state =
@@ -707,7 +707,7 @@ bool NetworkStateListDetailedView::ResetInfoBubble() {
 
 views::View* NetworkStateListDetailedView::CreateNetworkInfoView() {
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
-  NetworkStateHandler* handler = NetworkStateHandler::Get();
+  NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
 
   std::string ip_address("0.0.0.0");
   const NetworkState* network = handler->DefaultNetwork();
@@ -760,13 +760,13 @@ views::View* NetworkStateListDetailedView::CreateNetworkInfoView() {
 
 void NetworkStateListDetailedView::ConnectToNetwork(
     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;
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           chromeos::switches::kUseNewNetworkConfigurationHandlers)) {
-    NetworkConnectionHandler::Get()->ConnectToNetwork(
+    NetworkHandler::Get()->network_connection_handler()->ConnectToNetwork(
         service_path,
         base::Bind(&base::DoNothing),
         base::Bind(&NetworkStateListDetailedView::OnConnectFailed,
@@ -792,7 +792,7 @@ void NetworkStateListDetailedView::OnConnectFailed(
 
 void NetworkStateListDetailedView::CallRequestScan() {
   VLOG(1) << "Requesting Network Scan.";
-  NetworkStateHandler::Get()->RequestScan();
+  NetworkHandler::Get()->network_state_handler()->RequestScan();
   // Periodically request a scan while this UI is open.
   base::MessageLoopForUI::current()->PostDelayedTask(
       FROM_HERE,
@@ -801,7 +801,7 @@ void NetworkStateListDetailedView::CallRequestScan() {
 }
 
 void NetworkStateListDetailedView::ToggleMobile() {
-  NetworkStateHandler* handler = NetworkStateHandler::Get();
+  NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
   bool enabled =
       handler->IsTechnologyEnabled(NetworkStateHandler::kMatchTypeMobile);
   if (enabled) {