Componentize LoginManagerTest.

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"
-#include "chrome/browser/chromeos/login/login_manager_test.h"
+#include "chrome/browser/chromeos/login/login_manager_test_helper.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
 #include "chrome/browser/chromeos/login/webui_login_view.h"
 #include "chrome/browser/chromeos/net/network_portal_detector.h"
 #include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chromeos/chromeos_switches.h"
 
 namespace chromeos {
 
@@ skipping 145 matching lines @@
   OnRedirected();
   CheckState(true, 2);
 
   Close();
   CheckState(false, 2);
 
   OnOriginalURLLoaded();
   CheckState(false, 2);
 }
 
-class CaptivePortalWindowCtorDtorTest : public LoginManagerTest {
+class CaptivePortalWindowCtorDtorTest : public InProcessBrowserTest {
  public:
   CaptivePortalWindowCtorDtorTest()
-      : LoginManagerTest(false) {}
+      : login_manager_test_helper_(new LoginManagerTestHelper(false)) {
+    set_exit_when_last_browser_closes(false);
+  }
+
   virtual ~CaptivePortalWindowCtorDtorTest() {}
 
+  virtual void SetUpOnMainThread() OVERRIDE {
+    login_manager_test_helper_->SetUp();
+  }
+
+  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+    login_manager_test_helper_->SetUpCommandLine(command_line);
+  }
+
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
-    LoginManagerTest::SetUpInProcessBrowserTestFixture();
+    login_manager_test_helper_->SetUpLoginUtils();
 
     network_portal_detector_ = new NetworkPortalDetectorTestImpl();
     NetworkPortalDetector::InitializeForTesting(network_portal_detector_);
     NetworkPortalDetector::CaptivePortalState portal_state;
     portal_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL;
     portal_state.response_code = 200;
     network_portal_detector_->SetDefaultNetworkPathForTesting(
         kStubEthernetServicePath);
     network_portal_detector_->SetDetectionResultsForTesting(
         kStubEthernetServicePath, portal_state);
   }
 
+  virtual void CleanUpOnMainThread() OVERRIDE {
+    login_manager_test_helper_->CleanUp();
+  }
+
  protected:
   NetworkPortalDetectorTestImpl* network_portal_detector() {
     return network_portal_detector_;
   }
 
+  scoped_ptr<LoginManagerTestHelper> login_manager_test_helper_;
+
  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);
   actor->ShowCaptivePortal();
 }
 
 }  // namespace chromeos