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

Unified Diff: content/common/gpu/media/video_decode_accelerator_unittest.cc

Issue 11225045: Move a bunch of content\common code into the content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync Created 8 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/gpu/media/vaapi_video_decode_accelerator.cc ('k') | content/common/gpu/x_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/media/video_decode_accelerator_unittest.cc
===================================================================
--- content/common/gpu/media/video_decode_accelerator_unittest.cc (revision 163460)
+++ content/common/gpu/media/video_decode_accelerator_unittest.cc (working copy)
@@ -54,8 +54,8 @@
#endif // defined(OS_WIN)
using media::VideoDecodeAccelerator;
-using video_test_util::RenderingHelper;
+namespace content {
namespace {
// Values optionally filled in from flags; see main() below.
@@ -857,6 +857,7 @@
// - Test frame size changes mid-stream
} // namespace
+} // namespace content
int main(int argc, char **argv) {
testing::InitGoogleTest(&argc, argv); // Removes gtest-specific args.
@@ -877,7 +878,7 @@
for (CommandLine::SwitchMap::const_iterator it = switches.begin();
it != switches.end(); ++it) {
if (it->first == "test_video_data") {
- test_video_data = it->second.c_str();
+ content::test_video_data = it->second.c_str();
continue;
}
if (it->first == "v" || it->first == "vmodule")
@@ -886,14 +887,14 @@
}
base::ShadowingAtExitManager at_exit_manager;
- RenderingHelper::InitializePlatform();
+ content::RenderingHelper::InitializePlatform();
#if defined(OS_WIN)
- DXVAVideoDecodeAccelerator::PreSandboxInitialization();
+ content::DXVAVideoDecodeAccelerator::PreSandboxInitialization();
#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)
- OmxVideoDecodeAccelerator::PreSandboxInitialization();
+ content::OmxVideoDecodeAccelerator::PreSandboxInitialization();
#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)
- VaapiVideoDecodeAccelerator::PreSandboxInitialization();
+ content::VaapiVideoDecodeAccelerator::PreSandboxInitialization();
#endif
return RUN_ALL_TESTS();
« no previous file with comments | « content/common/gpu/media/vaapi_video_decode_accelerator.cc ('k') | content/common/gpu/x_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698