| Index: content/common/gpu/media/video_decode_accelerator_unittest.cc
|
| ===================================================================
|
| --- content/common/gpu/media/video_decode_accelerator_unittest.cc (revision 169901)
|
| +++ content/common/gpu/media/video_decode_accelerator_unittest.cc (working copy)
|
| @@ -890,7 +890,11 @@
|
| content::RenderingHelper::InitializePlatform();
|
|
|
| #if defined(OS_WIN)
|
| - content::DXVAVideoDecodeAccelerator::PreSandboxInitialization();
|
| + base::WaitableEvent event(true, false);
|
| + content::DXVAVideoDecodeAccelerator::PreSandboxInitialization(
|
| + base::Bind(&base::WaitableEvent::Signal,
|
| + base::Unretained(&event)));
|
| + event.Wait();
|
| #elif defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)
|
| content::OmxVideoDecodeAccelerator::PreSandboxInitialization();
|
| #elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)
|
|
|