Revert of Removed dependency on the UI from the NetworkPortalDetector.

chrome/browser/chromeos/net/network_portal_detector.h

Index: chrome/browser/chromeos/net/network_portal_detector.h
diff --git a/chrome/browser/chromeos/net/network_portal_detector.h b/chrome/browser/chromeos/net/network_portal_detector.h
index 4a5872fb040bd4c36f8540543e8aa6f707ff19e0..1add8ee1f5f459b2944b166d9ddf6e03c4b20e17 100644
--- a/chrome/browser/chromeos/net/network_portal_detector.h
+++ b/chrome/browser/chromeos/net/network_portal_detector.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_H_
 
 #include "base/basictypes.h"
-#include "chrome/browser/chromeos/net/network_portal_detector_strategy.h"
+#include "chrome/browser/chromeos/login/screens/error_screen.h"
 #include "net/url_request/url_fetcher.h"
 
 namespace chromeos {
@@ -16,7 +16,7 @@
 // This class handles all notifications about network changes from
 // NetworkStateHandler and delegates portal detection for the active
 // network to CaptivePortalService.
-class NetworkPortalDetector {
+class NetworkPortalDetector : public ErrorScreen::Observer {
  public:
   enum CaptivePortalStatus {
     CAPTIVE_PORTAL_STATUS_UNKNOWN  = 0,
@@ -96,9 +96,8 @@
   // started.
   virtual bool StartDetectionIfIdle() = 0;
 
-  // 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;
+  virtual void OnErrorScreenShow() OVERRIDE {}
+  virtual void OnErrorScreenHide() OVERRIDE {}
 
   // Initializes network portal detector for testing. The
   // |network_portal_detector| will be owned by the internal pointer