Revert "Speculative revert by sheriff"

chrome/browser/chromeos/login/hid_detection_browsertest.cc

Index: chrome/browser/chromeos/login/hid_detection_browsertest.cc
diff --git a/chrome/browser/chromeos/login/hid_detection_browsertest.cc b/chrome/browser/chromeos/login/hid_detection_browsertest.cc
index ebb23d204c44a1de316f44bc4f285f287c7a4f47..d4e31b214478bee6dac88348298b798b2f642a6c 100644
--- a/chrome/browser/chromeos/login/hid_detection_browsertest.cc
+++ b/chrome/browser/chromeos/login/hid_detection_browsertest.cc
@@ -43,11 +43,15 @@ void SetUpBluetoothMock(
 
 namespace chromeos {
 
-class HidDetectionTest : public OobeBaseTest {
+// Boolean parameter is used to run this test for webview (true) and for
+// iframe (false) GAIA sign in.
+class HidDetectionTest : public OobeBaseTest,
+                         public testing::WithParamInterface<bool> {
  public:
   typedef device::InputServiceLinux::InputDeviceInfo InputDeviceInfo;
 
   HidDetectionTest() : weak_ptr_factory_(this) {
+    set_use_webview(GetParam());
     InputServiceProxy::SetThreadIdForTesting(content::BrowserThread::UI);
     HidDetectionTest::InitInputService();
   }
@@ -112,13 +116,17 @@ class HidDetectionSkipTest : public HidDetectionTest {
   }
 };
 
-IN_PROC_BROWSER_TEST_F(HidDetectionTest, NoDevicesConnected) {
+IN_PROC_BROWSER_TEST_P(HidDetectionTest, NoDevicesConnected) {
   OobeScreenWaiter(OobeDisplay::SCREEN_OOBE_HID_DETECTION).Wait();
 }
 
-IN_PROC_BROWSER_TEST_F(HidDetectionSkipTest, BothDevicesPreConnected) {
+IN_PROC_BROWSER_TEST_P(HidDetectionSkipTest, BothDevicesPreConnected) {
   OobeScreenWaiter(OobeDisplay::SCREEN_OOBE_NETWORK).Wait();
-
 }
 
+INSTANTIATE_TEST_CASE_P(HidDetectionSuite, HidDetectionTest, testing::Bool());
+INSTANTIATE_TEST_CASE_P(HidDetectionSkipSuite,
+                        HidDetectionSkipTest,
+                        testing::Bool());
+
 }  // namespace chromeos