Chromium Code Reviews| 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..407656cf13d207a53b9ec67c2bf9568b22a013db 100644 |
| --- a/chrome/browser/chromeos/login/hid_detection_browsertest.cc |
| +++ b/chrome/browser/chromeos/login/hid_detection_browsertest.cc |
| @@ -43,11 +43,13 @@ void SetUpBluetoothMock( |
| namespace chromeos { |
| -class HidDetectionTest : public OobeBaseTest { |
| +class HidDetectionTest : public OobeBaseTest, |
| + public testing::WithParamInterface<bool> { |
| public: |
| typedef device::InputServiceLinux::InputDeviceInfo InputDeviceInfo; |
| HidDetectionTest() : weak_ptr_factory_(this) { |
| + use_webview_ = GetParam(); |
|
dzhioev (left Google)
2015/04/15 17:36:25
Create setter.
Nikita (slow)
2015/04/15 18:35:42
Done.
|
| InputServiceProxy::SetThreadIdForTesting(content::BrowserThread::UI); |
| HidDetectionTest::InitInputService(); |
| } |
| @@ -112,13 +114,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 |