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

chromeos/network/network_change_notifier_chromeos.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 <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/string_util.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
@@ skipping 40 matching lines @@
 NetworkChangeNotifierChromeos::NetworkChangeNotifierChromeos()
     : NetworkChangeNotifier(NetworkChangeCalculatorParamsChromeos()),
       connection_type_(CONNECTION_NONE) {
 }
 
 NetworkChangeNotifierChromeos::~NetworkChangeNotifierChromeos() {
 }
 
 void NetworkChangeNotifierChromeos::Initialize() {
   DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this);
-  NetworkStateHandler::Get()->AddObserver(this);
+  NetworkHandler::Get()->network_state_handler()->AddObserver(this);
 
   dns_config_service_.reset(new DnsConfigService());
   dns_config_service_->WatchConfig(
       base::Bind(net::NetworkChangeNotifier::SetDnsConfig));
 
   // Update initial connection state.
-  DefaultNetworkChanged(NetworkStateHandler::Get()->DefaultNetwork());
+  DefaultNetworkChanged(
+      NetworkHandler::Get()->network_state_handler()->DefaultNetwork());
 }
 
 void NetworkChangeNotifierChromeos::Shutdown() {
   dns_config_service_.reset();
-  if (NetworkStateHandler::Get())
-    NetworkStateHandler::Get()->RemoveObserver(this);
+  NetworkHandler::Get()->network_state_handler()->RemoveObserver(this);
   DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this);
 }
 
 net::NetworkChangeNotifier::ConnectionType
 NetworkChangeNotifierChromeos::GetCurrentConnectionType() const {
   return connection_type_;
 }
 
 void NetworkChangeNotifierChromeos::SystemResumed(
     const base::TimeDelta& sleep_duration) {
@@ skipping 118 matching lines @@
   // produce a single signal when switching between network connections.
   params.ip_address_offline_delay_ = base::TimeDelta::FromMilliseconds(4000);
   params.ip_address_online_delay_ = base::TimeDelta::FromMilliseconds(1000);
   params.connection_type_offline_delay_ =
       base::TimeDelta::FromMilliseconds(500);
   params.connection_type_online_delay_ = base::TimeDelta::FromMilliseconds(500);
   return params;
 }
 
 }  // namespace chromeos
-