NetworkPortalDetector/NetworkStateInformer: Switch over to use NetworkStateHandler

chrome/browser/chromeos/login/screens/update_screen.cc

Index: chrome/browser/chromeos/login/screens/update_screen.cc
diff --git a/chrome/browser/chromeos/login/screens/update_screen.cc b/chrome/browser/chromeos/login/screens/update_screen.cc
index 4fd7b76ed872c4802abf7f9e72c480d099e01028..f36473d5f8b188760288c097114295fe8ef34d3e 100644
--- a/chrome/browser/chromeos/login/screens/update_screen.cc
+++ b/chrome/browser/chromeos/login/screens/update_screen.cc
@@ -12,8 +12,6 @@
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/threading/thread_restrictions.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/login/screens/error_screen.h"
 #include "chrome/browser/chromeos/login/screens/screen_observer.h"
 #include "chrome/browser/chromeos/login/screens/update_screen_actor.h"
@@ -21,6 +19,7 @@
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/network/network_state.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
@@ -84,17 +83,6 @@ bool IsBlockingUpdateEnabledInCommandLine() {
       chromeos::switches::kDisableOOBEBlockingUpdate);
 }
 
-// TODO (ygorshenin@): switch over to use NetworkStateHandler.
-const Network* GetDefaultNetwork() {
-  CrosLibrary* cros = CrosLibrary::Get();
-  if (!cros)
-    return NULL;
-  NetworkLibrary* network_library = cros->GetNetworkLibrary();
-  if (!network_library)
-    return NULL;
-  return network_library->active_network();
-}
-
 }  // anonymous namespace
 
 // static
@@ -252,10 +240,10 @@ void UpdateScreen::UpdateStatusChanged(
 }
 
 void UpdateScreen::OnPortalDetectionCompleted(
-    const Network* network,
+    const NetworkState* network,
     const NetworkPortalDetector::CaptivePortalState& state) {
   LOG(WARNING) << "UpdateScreen::PortalDetectionCompleted(): "
-               << "network=" << (network ? network->service_path() : "") << ", "
+               << "network=" << (network ? network->path() : "") << ", "
                << "state.status=" << state.status << ", "
                << "state.response_code=" << state.response_code;
 
@@ -517,7 +505,7 @@ void UpdateScreen::HideErrorMessage() {
 }
 
 void UpdateScreen::UpdateErrorMessage(
-    const Network* network,
+    const NetworkState* network,
     const NetworkPortalDetector::CaptivePortalStatus status) {
   switch (status) {
     case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE: