Add a unified observer to replace NetworkManagerObserver

chrome/browser/ui/webui/chromeos/login/network_dropdown.cc

Index: chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
index c3ddec9fec9d25988890ba2e05ff8531aba6c16f..56cc4df56752202f91e31fb0cceb569d0de9738b 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
+++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
@@ -8,9 +8,9 @@
 
 #include "base/time.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/login/base_login_display_host.h"
 #include "chrome/browser/chromeos/login/login_display_host.h"
+#include "chrome/browser/chromeos/net/connectivity_state_helper.h"
 #include "content/public/browser/web_ui.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/gfx/font.h"
@@ -114,8 +114,8 @@ NetworkDropdown::NetworkDropdown(content::WebUI* web_ui,
   network_menu_.reset(new NetworkMenuWebUI(this, web_ui));
   network_icon_.reset(
       new NetworkMenuIcon(this, NetworkMenuIcon::DROPDOWN_MODE));
-  CrosLibrary::Get()->GetNetworkLibrary()->AddNetworkManagerObserver(this);
-  CrosLibrary::Get()->GetNetworkLibrary()->RequestNetworkScan();
+  ConnectivityStateHelper::Get()->AddNetworkManagerObserver(this);
+  ConnectivityStateHelper::Get()->RequestScan();
   Refresh();
   network_scan_timer_.Start(FROM_HERE,
       base::TimeDelta::FromSeconds(kNetworkScanIntervalSecs),
@@ -123,7 +123,7 @@ NetworkDropdown::NetworkDropdown(content::WebUI* web_ui,
 }
 
 NetworkDropdown::~NetworkDropdown() {
-  CrosLibrary::Get()->GetNetworkLibrary()->RemoveNetworkManagerObserver(this);
+  ConnectivityStateHelper::Get()->RemoveNetworkManagerObserver(this);
 }
 
 void NetworkDropdown::SetLastNetworkType(ConnectionType last_network_type) {
@@ -146,7 +146,7 @@ bool NetworkDropdown::ShouldOpenButtonOptions() const {
   return !oobe_;
 }
 
-void NetworkDropdown::OnNetworkManagerChanged(NetworkLibrary* cros) {
+void NetworkDropdown::NetworkManagerChanged() {
   Refresh();
 }
 
@@ -174,7 +174,7 @@ void NetworkDropdown::SetNetworkIconAndText() {
 }
 
 void NetworkDropdown::ForceNetworkScan() {
-  CrosLibrary::Get()->GetNetworkLibrary()->RequestNetworkScan();
+  ConnectivityStateHelper::Get()->RequestScan();
   Refresh();
 }