diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-22 11:51:37 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-22 11:51:37 +0000 |
| commit | e02864342b8cae36cdc3cfcfecc6e142f33e9f47 (patch) | |
| tree | d8d27cfc8128357022c7ab52ff7703809a0e4d2e /media/video | |
| parent | 651527da7b59797d570225ed6f5349b290fa1448 (diff) | |
| download | chromium_src-e02864342b8cae36cdc3cfcfecc6e142f33e9f47.zip chromium_src-e02864342b8cae36cdc3cfcfecc6e142f33e9f47.tar.gz chromium_src-e02864342b8cae36cdc3cfcfecc6e142f33e9f47.tar.bz2 | |
Get the VideoCaptureDeviceTest tests running on windows (again?).
TEST=run "media_unittests --gtest_filter=VideoCaptureDeviceTest*" on Windows.
Before all of the tests would succeed, but actually not test anything
since COM wasn't initialized.
BUG=162221
TBR=dalecurtis
Review URL: https://chromiumcodereview.appspot.com/11348178
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169255 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/video')
| -rw-r--r-- | media/video/capture/video_capture_device_unittest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/media/video/capture/video_capture_device_unittest.cc b/media/video/capture/video_capture_device_unittest.cc index 81a8ce5..74902f4 100644 --- a/media/video/capture/video_capture_device_unittest.cc +++ b/media/video/capture/video_capture_device_unittest.cc @@ -13,12 +13,16 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" +#if defined(OS_WIN) +#include "base/win/scoped_com_initializer.h" +#endif + #if defined(OS_MACOSX) // Mac/QTKit will always give you the size you ask for and this case will fail. #define MAYBE_AllocateBadSize DISABLED_AllocateBadSize // We will always get ARGB from the Mac/QTKit implementation. #define MAYBE_MJPEG DISABLED_CaptureMjpeg -#elif defined(OS_WINDOWS) +#elif defined(OS_WIN) #define MAYBE_AllocateBadSize AllocateBadSizei // Windows currently uses DirectShow to convert from MJPEG and a raw format is // always delivered. @@ -80,6 +84,9 @@ class VideoCaptureDeviceTest : public testing::Test { virtual void TearDown() { } +#if defined(OS_WIN) + base::win::ScopedCOMInitializer initialize_com_; +#endif base::WaitableEvent wait_event_; scoped_ptr<MockFrameObserver> frame_observer_; VideoCaptureDevice::Names names_; |