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 452b79ea915825402dfc57b2f6c16adc693afd70..117ad0b76e73528ab6d2a13e31a26c6896685d6d 100644
--- a/chrome/browser/chromeos/login/screens/update_screen.cc
+++ b/chrome/browser/chromeos/login/screens/update_screen.cc
@@ -12,7 +12,6 @@
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/threading/thread_restrictions.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"
@@ -20,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;
@@ -239,7 +239,7 @@ void UpdateScreen::UpdateStatusChanged(
 }
 
 void UpdateScreen::OnPortalDetectionCompleted(
-    const Network* network,
+    const NetworkState* network,
     const NetworkPortalDetector::CaptivePortalState& state) {
   // Wait for the sane portal detection results.
   if (!network ||
@@ -247,7 +247,7 @@ void UpdateScreen::OnPortalDetectionCompleted(
     return;
   }
   LOG(WARNING) << "UpdateScreen::OnPortalDetectionCompleted(): "
-               << "network=" << network->service_path() << ", "
+               << "network=" << network->path() << ", "
                << "state.status=" << state.status << ", "
                << "state.response_code=" << state.response_code;
   NetworkPortalDetector::CaptivePortalStatus status = state.status;
@@ -485,7 +485,7 @@ void UpdateScreen::HideErrorMessage() {
 }
 
 void UpdateScreen::UpdateErrorMessage(
-    const Network* network,
+    const NetworkState* network,
     const NetworkPortalDetector::CaptivePortalStatus status) {
   switch (status) {
     case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_UNKNOWN: