Removed dependency on the UI from the NetworkPortalDetector.

chrome/browser/chromeos/net/network_portal_detector.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_H_
 #define CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_H_
 
 #include "base/basictypes.h"
-#include "chrome/browser/chromeos/login/screens/error_screen.h"
+#include "chrome/browser/chromeos/net/network_portal_detector_strategy.h"
 #include "net/url_request/url_fetcher.h"
 
 namespace chromeos {
 
 class NetworkState;
 
 // This class handles all notifications about network changes from
 // NetworkStateHandler and delegates portal detection for the active
 // network to CaptivePortalService.
-class NetworkPortalDetector : public ErrorScreen::Observer {
+class NetworkPortalDetector {
  public:
   enum CaptivePortalStatus {
     CAPTIVE_PORTAL_STATUS_UNKNOWN  = 0,
     CAPTIVE_PORTAL_STATUS_OFFLINE  = 1,
     CAPTIVE_PORTAL_STATUS_ONLINE   = 2,
     CAPTIVE_PORTAL_STATUS_PORTAL   = 3,
     CAPTIVE_PORTAL_STATUS_PROXY_AUTH_REQUIRED = 4,
     CAPTIVE_PORTAL_STATUS_COUNT
   };
 
@@ skipping 59 matching lines @@
   // If |start_detection| is true and NetworkPortalDetector was
   // disabled previously, portal detection for the active network is
   // initiated by this method.
   virtual void Enable(bool start_detection) = 0;
 
   // Restarts portal detection for the default network if currently in
   // the idle state. Returns true if new portal detection attempt was
   // started.
   virtual bool StartDetectionIfIdle() = 0;
 
-  virtual void OnErrorScreenShow() OVERRIDE {}
-  virtual void OnErrorScreenHide() OVERRIDE {}
+  // Sets current strategy according to |id|. If current detection id
+  // doesn't equal to |id|, detection is restarted.
+  virtual void SetStrategy(PortalDetectorStrategy::StrategyId id) = 0;
 
   // Initializes network portal detector for testing. The
   // |network_portal_detector| will be owned by the internal pointer
   // and deleted by Shutdown().
   static void InitializeForTesting(
       NetworkPortalDetector* network_portal_detector);
 
   // Creates an instance of the NetworkPortalDetector.
   static void Initialize();
 
@@ skipping 16 matching lines @@
   NetworkPortalDetector() {}
   virtual ~NetworkPortalDetector() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NetworkPortalDetector);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_H_