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

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

 // Copyright 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.
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/login/captive_portal_window_proxy.h"
 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
@@ skipping 181 matching lines @@
         kStubEthernetServicePath);
     network_portal_detector_->SetDetectionResultsForTesting(
         kStubEthernetServicePath, portal_state);
   }
 
  protected:
   NetworkPortalDetectorTestImpl* network_portal_detector() {
     return network_portal_detector_;
   }
 
-  PortalDetectorStrategy::StrategyId strategy_id() {
-    return network_portal_detector_->strategy_id();
-  }
-
  private:
   NetworkPortalDetectorTestImpl* network_portal_detector_;
 
   DISALLOW_COPY_AND_ASSIGN(CaptivePortalWindowCtorDtorTest);
 };
 
 IN_PROC_BROWSER_TEST_F(CaptivePortalWindowCtorDtorTest, PRE_OpenPortalDialog) {
   StartupUtils::MarkOobeCompleted();
 }
 
 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();
 }
 
 }  // namespace chromeos