Revert 64888 - Push for ers:...

chrome/browser/chromeos/login/network_screen.cc

Index: chrome/browser/chromeos/login/network_screen.cc
===================================================================
--- chrome/browser/chromeos/login/network_screen.cc	(revision 64888)
+++ chrome/browser/chromeos/login/network_screen.cc	(working copy)
@@ -77,9 +77,9 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// NetworkLibrary::NetworkManagerObserver implementation:
+// NetworkLibrary::Observer implementation:
 
-void NetworkScreen::OnNetworkManagerChanged(NetworkLibrary* network_lib) {
+void NetworkScreen::NetworkChanged(NetworkLibrary* network_lib) {
   UpdateStatus(network_lib);
 }
 
@@ -110,7 +110,7 @@
 void NetworkScreen::Refresh() {
   if (CrosLibrary::Get()->EnsureLoaded()) {
     SubscribeNetworkNotification();
-    OnNetworkManagerChanged(chromeos::CrosLibrary::Get()->GetNetworkLibrary());
+    NetworkChanged(chromeos::CrosLibrary::Get()->GetNetworkLibrary());
   }
 }
 
@@ -120,16 +120,14 @@
 void NetworkScreen::SubscribeNetworkNotification() {
   if (!is_network_subscribed_) {
     is_network_subscribed_ = true;
-    chromeos::CrosLibrary::Get()->GetNetworkLibrary()
-        ->AddNetworkManagerObserver(this);
+    chromeos::CrosLibrary::Get()->GetNetworkLibrary()->AddObserver(this);
   }
 }
 
 void NetworkScreen::UnsubscribeNetworkNotification() {
   if (is_network_subscribed_) {
     is_network_subscribed_ = false;
-    chromeos::CrosLibrary::Get()->GetNetworkLibrary()
-        ->RemoveNetworkManagerObserver(this);
+    chromeos::CrosLibrary::Get()->GetNetworkLibrary()->RemoveObserver(this);
   }
 }