Chromium Code Reviews| Index: media/video/capture/video_capture_device_unittest.cc |
| diff --git a/media/video/capture/video_capture_device_unittest.cc b/media/video/capture/video_capture_device_unittest.cc |
| index 6d846aeb5d6f433ca50e1db37824f3fbbf7ac358..89b9b769906b58ea533ca51b03d984cad86395f7 100644 |
| --- a/media/video/capture/video_capture_device_unittest.cc |
| +++ b/media/video/capture/video_capture_device_unittest.cc |
| @@ -57,6 +57,15 @@ |
| #define MAYBE_CaptureMjpeg CaptureMjpeg |
| #endif |
| +// Cause hangs on Windows Debug. http://crbug.com/417824 |
| +#if defined(OS_WIN) && defined(_DEBUG) |
|
miu
2014/09/29 20:13:19
Should be:
#if defined(OS_WIN) && !defined(NDEB
|
| +#define MAYBE_OpenInvalidDevice DISABLED_OpenInvalidDevice |
| +#define MAYBE_ReAllocateCamera DISABLED_ReAllocateCamera |
| +#else |
| +#define MAYBE_OpenInvalidDevice OpenInvalidDevice |
| +#define MAYBE_ReAllocateCamera ReAllocateCamera |
| +#endif |
| + |
| using ::testing::_; |
| using ::testing::SaveArg; |
| @@ -201,7 +210,7 @@ class VideoCaptureDeviceTest : public testing::Test { |
| scoped_ptr<VideoCaptureDeviceFactory> video_capture_device_factory_; |
| }; |
| -TEST_F(VideoCaptureDeviceTest, OpenInvalidDevice) { |
| +TEST_F(VideoCaptureDeviceTest, MAYBE_OpenInvalidDevice) { |
| #if defined(OS_WIN) |
| VideoCaptureDevice::Name::CaptureApiType api_type = |
| VideoCaptureDeviceFactoryWin::PlatformSupportsMediaFoundation() |
| @@ -313,7 +322,7 @@ TEST_F(VideoCaptureDeviceTest, MAYBE_AllocateBadSize) { |
| EXPECT_EQ(last_format().frame_size.height(), 480); |
| } |
| -TEST_F(VideoCaptureDeviceTest, ReAllocateCamera) { |
| +TEST_F(VideoCaptureDeviceTest, MAYBE_ReAllocateCamera) { |
| names_ = EnumerateDevices(); |
| if (!names_->size()) { |
| DVLOG(1) << "No camera available. Exiting test."; |