NetworkPortalDetector/NetworkStateInformer: Switch over to use NetworkStateHandler

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

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_UPDATE_SCREEN_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_UPDATE_SCREEN_H_
 
 #include <set>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "chrome/browser/chromeos/login/screens/update_screen_actor.h"
 #include "chrome/browser/chromeos/login/screens/wizard_screen.h"
 #include "chrome/browser/chromeos/net/network_portal_detector.h"
 #include "chromeos/dbus/update_engine_client.h"
 
 namespace chromeos {
 
 class ErrorScreen;
+class NetworkState;
 class ScreenObserver;
 
 // Controller for the update screen. It does not depend on the specific
 // implementation of the screen showing (Views of WebUI based), the dependency
 // is moved to the UpdateScreenActor instead.
 class UpdateScreen: public UpdateEngineClient::Observer,
                     public UpdateScreenActor::Delegate,
                     public WizardScreen,
                     public NetworkPortalDetector::Observer {
  public:
@@ skipping 30 matching lines @@
   };
   // Reports update results to the ScreenObserver.
   virtual void ExitUpdate(ExitReason reason);
 
   // UpdateEngineClient::Observer implementation:
   virtual void UpdateStatusChanged(
       const UpdateEngineClient::Status& status) OVERRIDE;
 
   // NetworkPortalDetector::Observer implementation:
   virtual void OnPortalDetectionCompleted(
-      const Network* network,
+      const NetworkState* network,
       const NetworkPortalDetector::CaptivePortalState& state) OVERRIDE;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(UpdateScreenTest, TestBasic);
   FRIEND_TEST_ALL_PREFIXES(UpdateScreenTest, TestUpdateAvailable);
 
   enum State {
     STATE_IDLE = 0,
     STATE_FIRST_PORTAL_CHECK,
     STATE_UPDATE,
@@ skipping 14 matching lines @@
   // Checks that screen is shown, shows if not.
   void MakeSureScreenIsShown();
 
   // Returns an instance of the error screen.
   ErrorScreen* GetErrorScreen();
 
   void StartUpdateCheck();
   void ShowErrorMessage();
   void HideErrorMessage();
   void UpdateErrorMessage(
-      const Network* network,
+      const NetworkState* network,
       const NetworkPortalDetector::CaptivePortalStatus status);
   // Timer for the interval to wait for the reboot.
   // If reboot didn't happen - ask user to reboot manually.
   base::OneShotTimer<UpdateScreen> reboot_timer_;
 
   // Returns a static InstanceSet.
   typedef std::set<UpdateScreen*> InstanceSet;
   static InstanceSet& GetInstanceSet();
 
   // Current state of the update screen.
@@ skipping 39 matching lines @@
   bool is_first_portal_notification_;
 
   base::WeakPtrFactory<UpdateScreen> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(UpdateScreen);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_UPDATE_SCREEN_H_