Revert 268167 "Removed dependency on the UI from the NetworkPort..."

trunk/src/chrome/browser/chromeos/login/captive_portal_window_browsertest.cc

Index: trunk/src/chrome/browser/chromeos/login/captive_portal_window_browsertest.cc
===================================================================
--- trunk/src/chrome/browser/chromeos/login/captive_portal_window_browsertest.cc	(revision 268189)
+++ trunk/src/chrome/browser/chromeos/login/captive_portal_window_browsertest.cc	(working copy)
@@ -199,10 +199,6 @@
     return network_portal_detector_;
   }
 
-  PortalDetectorStrategy::StrategyId strategy_id() {
-    return network_portal_detector_->strategy_id();
-  }
-
  private:
   NetworkPortalDetectorTestImpl* network_portal_detector_;
 
@@ -214,22 +210,16 @@
 }
 
 IN_PROC_BROWSER_TEST_F(CaptivePortalWindowCtorDtorTest, OpenPortalDialog) {
+  network_portal_detector()->NotifyObserversForTesting();
+  OobeScreenWaiter(OobeDisplay::SCREEN_ERROR_MESSAGE).Wait();
   LoginDisplayHostImpl* host =
       static_cast<LoginDisplayHostImpl*>(LoginDisplayHostImpl::default_host());
+
   ASSERT_TRUE(host);
   OobeUI* oobe = host->GetOobeUI();
   ASSERT_TRUE(oobe);
   ErrorScreenActor* actor = oobe->GetErrorScreenActor();
   ASSERT_TRUE(actor);
-
-  // Error screen asks portal detector to change detection strategy.
-  ErrorScreen error_screen(NULL, actor);
-
-  ASSERT_EQ(PortalDetectorStrategy::STRATEGY_ID_LOGIN_SCREEN, strategy_id());
-  network_portal_detector()->NotifyObserversForTesting();
-  OobeScreenWaiter(OobeDisplay::SCREEN_ERROR_MESSAGE).Wait();
-  ASSERT_EQ(PortalDetectorStrategy::STRATEGY_ID_ERROR_SCREEN, strategy_id());
-
   actor->ShowCaptivePortal();
 }