Revert "Speculative revert by sheriff"

chrome/browser/chromeos/login/proxy_auth_dialog_browsertest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
@@ skipping 39 matching lines @@
     return true;
   }
 
   LoginHandler* login_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(ProxyAuthDialogWaiter);
 };
 
 }  // 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 {}
 
   void SetUp() override {
     ASSERT_TRUE(proxy_server_.Start());
     LoginManagerTest::SetUp();
   }
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     LoginManagerTest::SetUpCommandLine(command_line);
     command_line->AppendSwitchASCII(::switches::kProxyServer,
                                     proxy_server_.host_port_pair().ToString());
   }
 
  private:
   net::SpawnedTestServer proxy_server_;
 
   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();
   OobeUI* oobe_ui =
       static_cast<OobeUI*>(web_ui_login_view->GetWebUI()->GetController());
 
   {
     OobeScreenWaiter screen_waiter(OobeDisplay::SCREEN_ACCOUNT_PICKER);
     ProxyAuthDialogWaiter auth_dialog_waiter;
     screen_waiter.Wait();
     auth_dialog_waiter.Wait();
 
     ASSERT_TRUE(auth_dialog_waiter.login_handler());
     auth_dialog_waiter.login_handler()->CancelAuth();
   }
 
   {
     OobeScreenWaiter screen_waiter(OobeDisplay::SCREEN_GAIA_SIGNIN);
     ProxyAuthDialogWaiter auth_dialog_waiter;
     ASSERT_TRUE(content::ExecuteScript(oobe_ui->web_ui()->GetWebContents(),
                                        "window.domAutomationController.send(!!("
                                        "$('add-user-button').click()"
                                        "));"));
     screen_waiter.Wait();
     auth_dialog_waiter.Wait();
     ASSERT_TRUE(auth_dialog_waiter.login_handler());
   }
 }
 
+INSTANTIATE_TEST_CASE_P(ProxyAuthOnUserBoardScreenTestSuite,
+                        ProxyAuthOnUserBoardScreenTest,
+                        testing::Bool());
+
 }  // namespace chromeos