NetworkPortalDetector/NetworkStateInformer: Switch over to use NetworkStateHandler

chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.h"
 
-#include "chrome/browser/chromeos/cros/network_library.h"
+#include "base/values.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/managed/locally_managed_user_controller.h"
 #include "chrome/browser/chromeos/login/screens/error_screen.h"
 #include "chrome/browser/chromeos/login/screens/screen_observer.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
+#include "chromeos/network/network_state.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace chromeos {
 
 namespace {
 
 void ConfigureErrorScreen(ErrorScreen* screen,
-    const Network* network,
+    const NetworkState* network,
     const NetworkPortalDetector::CaptivePortalStatus status) {
   switch (status) {
     case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_UNKNOWN:
     case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE:
       NOTREACHED();
       break;
     case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_OFFLINE:
       screen->SetErrorState(ErrorScreen::ERROR_STATE_OFFLINE,
                             std::string());
       break;
@@ skipping 47 matching lines @@
       actor_->ShowIntroPage();
   }
 
   NetworkPortalDetector* detector = NetworkPortalDetector::GetInstance();
   if (detector && !on_error_screen_)
     detector->AddAndFireObserver(this);
   on_error_screen_ = false;
 }
 
 void LocallyManagedUserCreationScreen::OnPortalDetectionCompleted(
-    const Network* network,
+    const NetworkState* network,
     const NetworkPortalDetector::CaptivePortalState& state)  {
   if (state.status == NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE) {
     get_screen_observer()->HideErrorScreen(this);
   } else {
     on_error_screen_ = true;
     ErrorScreen* screen = get_screen_observer()->GetErrorScreen();
     ConfigureErrorScreen(screen, network, state.status);
     screen->SetUIState(ErrorScreen::UI_STATE_LOCALLY_MANAGED);
     get_screen_observer()->ShowErrorScreen();
   }
@@ skipping 120 matching lines @@
 
   WizardController::default_controller()->
       AdvanceToScreenWithParams(WizardController::kUserImageScreenName, params);
 }
 
 void LocallyManagedUserCreationScreen::OnCreationSuccess() {
   SelectPicture();
 }
 
 }  // namespace chromeos