Index: chrome/browser/chromeos/login/proxy_auth_dialog_browsertest.cc |
diff --git a/chrome/browser/chromeos/login/proxy_auth_dialog_browsertest.cc b/chrome/browser/chromeos/login/proxy_auth_dialog_browsertest.cc |
index 3eef72f7496d7905ec0afda37cd508c0d36adbb2..eca6b5c415d220abfc210f4327470b7b4576b20d 100644 |
--- a/chrome/browser/chromeos/login/proxy_auth_dialog_browsertest.cc |
+++ b/chrome/browser/chromeos/login/proxy_auth_dialog_browsertest.cc |
@@ -57,21 +57,13 @@ class ProxyAuthDialogWaiter : public content::WindowedNotificationObserver { |
} // namespace |
-// Boolean parameter is used to run this test for webview (true) and for |
-// iframe (false) GAIA sign in. |
-class ProxyAuthOnUserBoardScreenTest |
- : public LoginManagerTest, |
- public testing::WithParamInterface<bool> { |
+class ProxyAuthOnUserBoardScreenTest : public LoginManagerTest { |
public: |
ProxyAuthOnUserBoardScreenTest() |
: LoginManagerTest(true /* should_launch_browser */), |
proxy_server_(net::SpawnedTestServer::TYPE_BASIC_AUTH_PROXY, |
net::SpawnedTestServer::kLocalhost, |
- base::FilePath()) { |
- // TODO(paulmeyer): Re-enable webview version of this test |
- // (uncomment this line) once http://crbug.com/452452 is fixed. |
- // set_use_webview(GetParam()); |
- } |
+ base::FilePath()) {} |
~ProxyAuthOnUserBoardScreenTest() override {} |
@@ -92,13 +84,13 @@ class ProxyAuthOnUserBoardScreenTest |
DISALLOW_COPY_AND_ASSIGN(ProxyAuthOnUserBoardScreenTest); |
}; |
-IN_PROC_BROWSER_TEST_P(ProxyAuthOnUserBoardScreenTest, |
+IN_PROC_BROWSER_TEST_F(ProxyAuthOnUserBoardScreenTest, |
PRE_ProxyAuthDialogOnUserBoardScreen) { |
RegisterUser("test-user@gmail.com"); |
StartupUtils::MarkOobeCompleted(); |
} |
-IN_PROC_BROWSER_TEST_P(ProxyAuthOnUserBoardScreenTest, |
+IN_PROC_BROWSER_TEST_F(ProxyAuthOnUserBoardScreenTest, |
ProxyAuthDialogOnUserBoardScreen) { |
LoginDisplayHost* login_display_host = LoginDisplayHostImpl::default_host(); |
WebUILoginView* web_ui_login_view = login_display_host->GetWebUILoginView(); |
@@ -128,8 +120,4 @@ IN_PROC_BROWSER_TEST_P(ProxyAuthOnUserBoardScreenTest, |
} |
} |
-INSTANTIATE_TEST_CASE_P(ProxyAuthOnUserBoardScreenTestSuite, |
- ProxyAuthOnUserBoardScreenTest, |
- testing::Bool()); |
- |
} // namespace chromeos |