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

chrome/browser/chromeos/net/connectivity_state_helper.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/net/connectivity_state_helper.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chromeos/chromeos_switches.h"
@@ skipping 110 matching lines @@
     ConnectivityStateHelperObserver* observer) {
   connectivity_observers_.AddObserver(observer);
 }
 
 void ConnectivityStateHelper::RemoveNetworkManagerObserver(
     ConnectivityStateHelperObserver* observer) {
   connectivity_observers_.RemoveObserver(observer);
 }
 
 ConnectivityStateHelperImpl::ConnectivityStateHelperImpl() {
-  network_state_handler_ = NetworkStateHandler::Get();
+  network_state_handler_ = NetworkHandler::Get()->network_state_handler();
   network_state_handler_->AddObserver(this);
 }
 
 ConnectivityStateHelperImpl::~ConnectivityStateHelperImpl() {
-  NetworkStateHandler::Get()->RemoveObserver(this);
+  network_state_handler_->RemoveObserver(this);
 }
 
 bool ConnectivityStateHelperImpl::IsConnected() {
   return network_state_handler_->ConnectedNetworkByType(
       NetworkStateHandler::kMatchTypeDefault) != NULL;
 }
 
 bool ConnectivityStateHelperImpl::IsConnecting() {
   return network_state_handler_->ConnectingNetworkByType(
       NetworkStateHandler::kMatchTypeDefault) != NULL;
@@ skipping 132 matching lines @@
   network_library_->RequestNetworkScan();
 }
 
 void ConnectivityStateHelperNetworkLibrary::OnNetworkManagerChanged(
     NetworkLibrary* network_library) {
   FOR_EACH_OBSERVER(ConnectivityStateHelperObserver, connectivity_observers_,
                     NetworkManagerChanged());
 }
 
 }  // namespace chromeos