Componentize LoginManagerTest.

chrome/browser/chromeos/net/network_portal_detector_impl_browsertest.cc

Index: chrome/browser/chromeos/net/network_portal_detector_impl_browsertest.cc
diff --git a/chrome/browser/chromeos/net/network_portal_detector_impl_browsertest.cc b/chrome/browser/chromeos/net/network_portal_detector_impl_browsertest.cc
index 70a0135dea10ad283051575a58d2dbffdbde69bd..c9db55f7c6d41bbab9cf19e91eb1c37b6dad01e5 100644
--- a/chrome/browser/chromeos/net/network_portal_detector_impl_browsertest.cc
+++ b/chrome/browser/chromeos/net/network_portal_detector_impl_browsertest.cc
@@ -7,12 +7,13 @@
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "chrome/browser/browser_process.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/net/network_portal_detector.h"
 #include "chrome/browser/chromeos/net/network_portal_detector_impl.h"
 #include "chrome/browser/chromeos/net/network_portal_detector_strategy.h"
 #include "chrome/browser/chromeos/net/network_portal_detector_test_utils.h"
+#include "chrome/test/base/in_process_browser_test.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/shill_service_client.h"
@@ -90,15 +91,19 @@ class TestObserver : public MessageCenterObserver {
 }  // namespace
 
 class NetworkPortalDetectorImplBrowserTest
-    : public LoginManagerTest,
+    : public InProcessBrowserTest,
       public captive_portal::CaptivePortalDetectorTestBase {
  public:
   NetworkPortalDetectorImplBrowserTest()
-      : LoginManagerTest(false), network_portal_detector_(NULL) {}
+       : login_manager_test_helper_(new LoginManagerTestHelper(false)),
+         network_portal_detector_(NULL) {
+    set_exit_when_last_browser_closes(false);
+  }
+
   virtual ~NetworkPortalDetectorImplBrowserTest() {}
 
   virtual void SetUpOnMainThread() OVERRIDE {
-    LoginManagerTest::SetUpOnMainThread();
+    login_manager_test_helper_->SetUp();
 
     ShillServiceClient::TestInterface* service_test =
         DBusThreadManager::Get()->GetShillServiceClient()->GetTestInterface();
@@ -126,6 +131,18 @@ class NetworkPortalDetectorImplBrowserTest
     base::RunLoop().RunUntilIdle();
   }
 
+  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+    login_manager_test_helper_->SetUpCommandLine(command_line);
+  }
+
+  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+    login_manager_test_helper_->SetUpLoginUtils();
+  }
+
+  virtual void CleanUpOnMainThread() OVERRIDE {
+    login_manager_test_helper_->CleanUp();
+  }
+
   void RestartDetection() {
     network_portal_detector_->StopDetection();
     network_portal_detector_->StartDetection();
@@ -138,6 +155,9 @@ class NetworkPortalDetectorImplBrowserTest
 
   MessageCenter* message_center() { return MessageCenter::Get(); }
 
+ protected:
+  scoped_ptr<LoginManagerTestHelper> login_manager_test_helper_;
+
  private:
   NetworkPortalDetectorImpl* network_portal_detector_;
 
@@ -146,7 +166,7 @@ class NetworkPortalDetectorImplBrowserTest
 
 IN_PROC_BROWSER_TEST_F(NetworkPortalDetectorImplBrowserTest,
                        PRE_InSessionDetection) {
-  RegisterUser(kTestUser);
+  login_manager_test_helper_->RegisterUser(kTestUser);
   StartupUtils::MarkOobeCompleted();
   ASSERT_EQ(PortalDetectorStrategy::STRATEGY_ID_LOGIN_SCREEN, strategy()->Id());
 }
@@ -162,7 +182,7 @@ IN_PROC_BROWSER_TEST_F(NetworkPortalDetectorImplBrowserTest,
   EnumHistogramChecker action_checker(
       kUserActionMetric, Controller::USER_ACTION_METRIC_COUNT, NULL);
 
-  LoginUser(kTestUser);
+  login_manager_test_helper_->LogInUser(kTestUser);
   content::RunAllPendingInMessageLoop();
 
   // User connects to wifi.