| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 // | 4 // |
| 5 // The bulk of this file is support code; sorry about that. Here's an overview | 5 // The bulk of this file is support code; sorry about that. Here's an overview |
| 6 // to hopefully help readers of this code: | 6 // to hopefully help readers of this code: |
| 7 // - RenderingHelper is charged with interacting with X11/{EGL/GLES2,GLX/GL} or | 7 // - RenderingHelper is charged with interacting with X11/{EGL/GLES2,GLX/GL} or |
| 8 // Win/EGL. | 8 // Win/EGL. |
| 9 // - ClientState is an enum for the state of the decode client used by the test. | 9 // - ClientState is an enum for the state of the decode client used by the test. |
| 10 // - ClientStateNotification is a barrier abstraction that allows the test code | 10 // - ClientStateNotification is a barrier abstraction that allows the test code |
| (...skipping 1816 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1827 #endif // OS_WIN || USE_OZONE | 1827 #endif // OS_WIN || USE_OZONE |
| 1828 | 1828 |
| 1829 base::test::ScopedTaskScheduler scoped_task_scheduler(&main_loop); | 1829 base::test::ScopedTaskScheduler scoped_task_scheduler(&main_loop); |
| 1830 | 1830 |
| 1831 media::g_env = | 1831 media::g_env = |
| 1832 reinterpret_cast<media::VideoDecodeAcceleratorTestEnvironment*>( | 1832 reinterpret_cast<media::VideoDecodeAcceleratorTestEnvironment*>( |
| 1833 testing::AddGlobalTestEnvironment( | 1833 testing::AddGlobalTestEnvironment( |
| 1834 new media::VideoDecodeAcceleratorTestEnvironment())); | 1834 new media::VideoDecodeAcceleratorTestEnvironment())); |
| 1835 | 1835 |
| 1836 #if defined(USE_OZONE) | 1836 #if defined(USE_OZONE) |
| 1837 ui::OzonePlatform::InitializeForUI(); | 1837 ui::OzonePlatform::InitParams params; |
| 1838 params.single_process = true; |
| 1839 ui::OzonePlatform::InitializeForUI(params); |
| 1838 #endif | 1840 #endif |
| 1839 | 1841 |
| 1840 #if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) | 1842 #if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) |
| 1841 media::VaapiWrapper::PreSandboxInitialization(); | 1843 media::VaapiWrapper::PreSandboxInitialization(); |
| 1842 #elif defined(OS_WIN) | 1844 #elif defined(OS_WIN) |
| 1843 media::DXVAVideoDecodeAccelerator::PreSandboxInitialization(); | 1845 media::DXVAVideoDecodeAccelerator::PreSandboxInitialization(); |
| 1844 #endif | 1846 #endif |
| 1845 return base::TestSuite::Run(); | 1847 return base::TestSuite::Run(); |
| 1846 } | 1848 } |
| 1847 }; | 1849 }; |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1915 media::g_thumbnail_output_dir = base::FilePath(it->second.c_str()); | 1917 media::g_thumbnail_output_dir = base::FilePath(it->second.c_str()); |
| 1916 } | 1918 } |
| 1917 } | 1919 } |
| 1918 | 1920 |
| 1919 base::ShadowingAtExitManager at_exit_manager; | 1921 base::ShadowingAtExitManager at_exit_manager; |
| 1920 | 1922 |
| 1921 return base::LaunchUnitTestsSerially( | 1923 return base::LaunchUnitTestsSerially( |
| 1922 argc, argv, | 1924 argc, argv, |
| 1923 base::Bind(&media::VDATestSuite::Run, base::Unretained(&test_suite))); | 1925 base::Bind(&media::VDATestSuite::Run, base::Unretained(&test_suite))); |
| 1924 } | 1926 } |
| OLD | NEW |