Componentize LoginManagerTest.

chrome/browser/chromeos/login/captive_portal_window_browsertest.cc

Index: chrome/browser/chromeos/login/captive_portal_window_browsertest.cc
diff --git a/chrome/browser/chromeos/login/captive_portal_window_browsertest.cc b/chrome/browser/chromeos/login/captive_portal_window_browsertest.cc
index cccf9aefb5aaafde0c50b5b39910ff1928898532..7dc7e751b600f025d4cf98958dd102d2852da877 100644
--- a/chrome/browser/chromeos/login/captive_portal_window_browsertest.cc
+++ b/chrome/browser/chromeos/login/captive_portal_window_browsertest.cc
@@ -8,7 +8,7 @@
 #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"
@@ -174,14 +174,25 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalWindowTest, MultipleCalls) {
   CheckState(false, 2);
 }
 
-class CaptivePortalWindowCtorDtorTest : public LoginManagerTest {
+class CaptivePortalWindowCtorDtorTest : public InProcessBrowserTest {
  public:
   CaptivePortalWindowCtorDtorTest()
-      : LoginManagerTest(false) {}
+      : login_manager_test_helper_(new LoginManagerTestHelper) {
+    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(false);
 
     network_portal_detector_ = new NetworkPortalDetectorTestImpl();
     NetworkPortalDetector::InitializeForTesting(network_portal_detector_);
@@ -194,11 +205,17 @@ class CaptivePortalWindowCtorDtorTest : public LoginManagerTest {
         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_;