Revert "Speculative revert by sheriff"

chrome/browser/chromeos/login/proxy_auth_dialog_browsertest.cc

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 eca6b5c415d220abfc210f4327470b7b4576b20d..3eef72f7496d7905ec0afda37cd508c0d36adbb2 100644
--- a/chrome/browser/chromeos/login/proxy_auth_dialog_browsertest.cc
+++ b/chrome/browser/chromeos/login/proxy_auth_dialog_browsertest.cc
@@ -57,13 +57,21 @@ class ProxyAuthDialogWaiter : public content::WindowedNotificationObserver {
 
 }  // namespace
 
-class ProxyAuthOnUserBoardScreenTest : public LoginManagerTest {
+// 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> {
  public:
   ProxyAuthOnUserBoardScreenTest()
       : LoginManagerTest(true /* should_launch_browser */),
         proxy_server_(net::SpawnedTestServer::TYPE_BASIC_AUTH_PROXY,
                       net::SpawnedTestServer::kLocalhost,
-                      base::FilePath()) {}
+                      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());
+  }
 
   ~ProxyAuthOnUserBoardScreenTest() override {}
 
@@ -84,13 +92,13 @@ class ProxyAuthOnUserBoardScreenTest : public LoginManagerTest {
   DISALLOW_COPY_AND_ASSIGN(ProxyAuthOnUserBoardScreenTest);
 };
 
-IN_PROC_BROWSER_TEST_F(ProxyAuthOnUserBoardScreenTest,
+IN_PROC_BROWSER_TEST_P(ProxyAuthOnUserBoardScreenTest,
                        PRE_ProxyAuthDialogOnUserBoardScreen) {
   RegisterUser("test-user@gmail.com");
   StartupUtils::MarkOobeCompleted();
 }
 
-IN_PROC_BROWSER_TEST_F(ProxyAuthOnUserBoardScreenTest,
+IN_PROC_BROWSER_TEST_P(ProxyAuthOnUserBoardScreenTest,
                        ProxyAuthDialogOnUserBoardScreen) {
   LoginDisplayHost* login_display_host = LoginDisplayHostImpl::default_host();
   WebUILoginView* web_ui_login_view = login_display_host->GetWebUILoginView();
@@ -120,4 +128,8 @@ IN_PROC_BROWSER_TEST_F(ProxyAuthOnUserBoardScreenTest,
   }
 }
 
+INSTANTIATE_TEST_CASE_P(ProxyAuthOnUserBoardScreenTestSuite,
+                        ProxyAuthOnUserBoardScreenTest,
+                        testing::Bool());
+
 }  // namespace chromeos