Index: chrome/browser/chromeos/network_login_observer.cc |
diff --git a/chrome/browser/chromeos/network_login_observer.cc b/chrome/browser/chromeos/network_login_observer.cc |
index 71c22fdd926dc484cd3057f57446852b4c4dd2ad..d7e9662f5ffc3c8aed74f0d8f0c92dc8c3cbab1d 100644 |
--- a/chrome/browser/chromeos/network_login_observer.cc |
+++ b/chrome/browser/chromeos/network_login_observer.cc |
@@ -13,16 +13,16 @@ |
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) { |
@@ -93,7 +93,7 @@ void NetworkLoginObserver::OnCertificatesLoaded( |
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(); |
} |
} |