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

chrome/browser/chromeos/network_login_observer.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/chromeos/network_login_observer.h"
 
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/options/network_config_view.h"
 #include "chromeos/network/network_state_handler.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace chromeos {
 
 NetworkLoginObserver::NetworkLoginObserver() {
-  // CertLoader does not get initialized in many unit tests even though
+  // NetworkHandler does not get initialized in many unit tests even though
   // NetworkLibrary which owns this class does. TODO(stevenjb): Eliminate
   // this class along with NetworkLibrary, crbug.com/154852.
-  if (CertLoader::IsInitialized())
-    CertLoader::Get()->AddObserver(this);
+  if (NetworkHandler::IsInitialized())
+    NetworkHandler::Get()->cert_loader()->AddObserver(this);
 }
 
 NetworkLoginObserver::~NetworkLoginObserver() {
-  if (CertLoader::IsInitialized())
-    CertLoader::Get()->RemoveObserver(this);
+  if (NetworkHandler::IsInitialized())
+    NetworkHandler::Get()->cert_loader()->RemoveObserver(this);
 }
 
 void NetworkLoginObserver::OnNetworkManagerChanged(NetworkLibrary* cros) {
   // Check to see if we have any newly failed wifi network.
   const WifiNetworkVector& wifi_networks = cros->wifi_networks();
   for (WifiNetworkVector::const_iterator it = wifi_networks.begin();
        it != wifi_networks.end(); it++) {
     WifiNetwork* wifi = *it;
     if (wifi->notify_failure()) {
       // Display login dialog again for bad_passphrase and bad_wepkey errors.
@@ skipping 50 matching lines @@
       }
     }
   }
 }
 
 void NetworkLoginObserver::OnCertificatesLoaded(
     const net::CertificateList& cert_list,
     bool initial_load) {
   if (initial_load) {
     // Once certificates have loaded, connect to the "best" available network.
-    NetworkStateHandler::Get()->ConnectToBestWifiNetwork();
+    NetworkHandler::Get()->network_state_handler()->ConnectToBestWifiNetwork();
   }
 }
 
 }  // namespace chromeos