Speculative revert by sheriff

chrome/browser/chromeos/login/hid_detection_browsertest.cc

 // Copyright 2014 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/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/chromeos/login/test/oobe_base_test.h"
 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
@@ skipping 25 matching lines @@
   EXPECT_CALL(*mock_adapter, IsPowered())
       .WillRepeatedly(testing::Return(true));
   EXPECT_CALL(*mock_adapter, GetDevices()).WillRepeatedly(
       testing::Return(device::BluetoothAdapter::ConstDeviceList()));
 }
 
 }  // namespace
 
 namespace chromeos {
 
-// 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> {
+class HidDetectionTest : public OobeBaseTest {
  public:
   typedef device::InputServiceLinux::InputDeviceInfo InputDeviceInfo;
 
   HidDetectionTest() : weak_ptr_factory_(this) {
-    set_use_webview(GetParam());
     InputServiceProxy::SetThreadIdForTesting(content::BrowserThread::UI);
     HidDetectionTest::InitInputService();
   }
 
   ~HidDetectionTest() override {}
 
   void InitInputService() {
     input_service_linux_.reset(new device::FakeInputServiceLinux);
     InputServiceLinux::SetForTesting(input_service_linux_.get());
   }
@@ skipping 44 matching lines @@
   HidDetectionSkipTest() {
     AddUsbMouse("mouse");
     AddUsbKeyboard("keyboard");
   }
 
   void SetUpOnMainThread() override {
     HidDetectionTest::SetUpOnMainThread();
   }
 };
 
-IN_PROC_BROWSER_TEST_P(HidDetectionTest, NoDevicesConnected) {
+IN_PROC_BROWSER_TEST_F(HidDetectionTest, NoDevicesConnected) {
   OobeScreenWaiter(OobeDisplay::SCREEN_OOBE_HID_DETECTION).Wait();
 }
 
-IN_PROC_BROWSER_TEST_P(HidDetectionSkipTest, BothDevicesPreConnected) {
+IN_PROC_BROWSER_TEST_F(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