Removed dependency on the UI from the NetworkPortalDetector.

chrome/browser/chromeos/login/screens/error_screen.cc

Index: chrome/browser/chromeos/login/screens/error_screen.cc
diff --git a/chrome/browser/chromeos/login/screens/error_screen.cc b/chrome/browser/chromeos/login/screens/error_screen.cc
index a7a7bab6d95f35a108f71ca7ad26fa6051d1b620..2aedacadbc6624fd4e056fa4acf4af2d28257225 100644
--- a/chrome/browser/chromeos/login/screens/error_screen.cc
+++ b/chrome/browser/chromeos/login/screens/error_screen.cc
@@ -10,6 +10,7 @@
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/net/network_portal_detector.h"
+#include "chrome/browser/chromeos/net/network_portal_detector_strategy.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 
 namespace chromeos {
@@ -22,22 +23,10 @@ ErrorScreen::ErrorScreen(ScreenObserver* screen_observer,
       weak_factory_(this) {
   DCHECK(actor_);
   actor_->SetDelegate(this);
-  AddObserver(NetworkPortalDetector::Get());
 }
 
 ErrorScreen::~ErrorScreen() {
   actor_->SetDelegate(NULL);
-  RemoveObserver(NetworkPortalDetector::Get());
-}
-
-void ErrorScreen::AddObserver(Observer* observer) {
-  if (observer)
-    observers_.AddObserver(observer);
-}
-
-void ErrorScreen::RemoveObserver(Observer* observer) {
-  if (observer)
-    observers_.RemoveObserver(observer);
 }
 
 void ErrorScreen::PrepareToShow() {
@@ -58,11 +47,13 @@ std::string ErrorScreen::GetName() const {
 }
 
 void ErrorScreen::OnErrorShow() {
-  FOR_EACH_OBSERVER(Observer, observers_, OnErrorScreenShow());
+  NetworkPortalDetector::Get()->SetStrategy(
+      PortalDetectorStrategy::STRATEGY_ID_ERROR_SCREEN);
 }
 
 void ErrorScreen::OnErrorHide() {
-  FOR_EACH_OBSERVER(Observer, observers_, OnErrorScreenHide());
+  NetworkPortalDetector::Get()->SetStrategy(
+      PortalDetectorStrategy::STRATEGY_ID_LOGIN_SCREEN);
 }
 
 void ErrorScreen::OnLaunchOobeGuestSession() {