Index: chrome/browser/chromeos/login/simple_web_view_dialog_browsertest.cc |
diff --git a/chrome/browser/chromeos/login/simple_web_view_dialog_browsertest.cc b/chrome/browser/chromeos/login/simple_web_view_dialog_browsertest.cc |
index e0a40d880e8902c18608587b4b81666e7d9dfe64..9de5a31b5a05e17b864eac14bfa57d18f9531e67 100644 |
--- a/chrome/browser/chromeos/login/simple_web_view_dialog_browsertest.cc |
+++ b/chrome/browser/chromeos/login/simple_web_view_dialog_browsertest.cc |
@@ -8,10 +8,11 @@ |
#include "chrome/browser/chromeos/login/captive_portal_view.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/simple_web_view_dialog.h" |
#include "chrome/browser/chromeos/login/webui_login_view.h" |
#include "chrome/browser/chromeos/profiles/profile_helper.h" |
+#include "chrome/test/base/in_process_browser_test.h" |
#include "content/public/browser/interstitial_page.h" |
#include "content/public/browser/interstitial_page_delegate.h" |
#include "ui/views/controls/webview/webview.h" |
@@ -49,11 +50,31 @@ class InterstitialPageDelegate : public content::InterstitialPageDelegate { |
} // namespace |
-class SimpleWebViewDialogTest : public LoginManagerTest { |
+class SimpleWebViewDialogTest : public InProcessBrowserTest { |
public: |
- SimpleWebViewDialogTest(): LoginManagerTest(false) {} |
+ SimpleWebViewDialogTest() |
+ : login_manager_test_helper_(new LoginManagerTestHelper) { |
+ set_exit_when_last_browser_closes(false); |
+ } |
+ |
virtual ~SimpleWebViewDialogTest() {} |
+ 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 { |
+ login_manager_test_helper_->SetUpLoginUtils(false); |
+ } |
+ |
+ virtual void CleanUpOnMainThread() OVERRIDE { |
+ login_manager_test_helper_->CleanUp(); |
+ } |
+ |
InterstitialPageDelegate* CreateDelegate(CaptivePortalWindowProxy* proxy) { |
SimpleWebViewDialog* dialog = proxy->captive_portal_view_for_testing(); |
CHECK(dialog) << "CaptivePortalView is not initialized"; |
@@ -61,6 +82,8 @@ class SimpleWebViewDialogTest : public LoginManagerTest { |
} |
private: |
+ scoped_ptr<LoginManagerTestHelper> login_manager_test_helper_; |
+ |
DISALLOW_COPY_AND_ASSIGN(SimpleWebViewDialogTest); |
}; |