Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(242)

Side by Side Diff: media/gpu/video_decode_accelerator_unittest.cc

Issue 2769123002: Remove InitializeForUI() from OzonePlatform (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | ui/aura/env.cc » ('j') | ui/aura/env.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1793 matching lines...) Expand 10 before | Expand all | Expand 10 after
1804 #endif // OS_WIN || USE_OZONE 1804 #endif // OS_WIN || USE_OZONE
1805 1805
1806 base::test::ScopedTaskScheduler scoped_task_scheduler(&main_loop); 1806 base::test::ScopedTaskScheduler scoped_task_scheduler(&main_loop);
1807 1807
1808 media::g_env = 1808 media::g_env =
1809 reinterpret_cast<media::VideoDecodeAcceleratorTestEnvironment*>( 1809 reinterpret_cast<media::VideoDecodeAcceleratorTestEnvironment*>(
1810 testing::AddGlobalTestEnvironment( 1810 testing::AddGlobalTestEnvironment(
1811 new media::VideoDecodeAcceleratorTestEnvironment())); 1811 new media::VideoDecodeAcceleratorTestEnvironment()));
1812 1812
1813 #if defined(USE_OZONE) 1813 #if defined(USE_OZONE)
1814 ui::OzonePlatform::InitializeForUI(); 1814 ui::OzonePlatform::InitParams params;
1815 params.single_process = true;
1816 ui::OzonePlatform::InitializeForUI(params);
1815 #endif 1817 #endif
1816 1818
1817 #if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) 1819 #if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)
1818 media::VaapiWrapper::PreSandboxInitialization(); 1820 media::VaapiWrapper::PreSandboxInitialization();
1819 #elif defined(OS_WIN) 1821 #elif defined(OS_WIN)
1820 media::DXVAVideoDecodeAccelerator::PreSandboxInitialization(); 1822 media::DXVAVideoDecodeAccelerator::PreSandboxInitialization();
1821 #endif 1823 #endif
1822 return base::TestSuite::Run(); 1824 return base::TestSuite::Run();
1823 } 1825 }
1824 }; 1826 };
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
1889 continue; 1891 continue;
1890 } 1892 }
1891 } 1893 }
1892 1894
1893 base::ShadowingAtExitManager at_exit_manager; 1895 base::ShadowingAtExitManager at_exit_manager;
1894 1896
1895 return base::LaunchUnitTestsSerially( 1897 return base::LaunchUnitTestsSerially(
1896 argc, argv, 1898 argc, argv,
1897 base::Bind(&media::VDATestSuite::Run, base::Unretained(&test_suite))); 1899 base::Bind(&media::VDATestSuite::Run, base::Unretained(&test_suite)));
1898 } 1900 }
OLDNEW
« no previous file with comments | « no previous file | ui/aura/env.cc » ('j') | ui/aura/env.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698