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

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

Issue 16519003: Define a LoggingSettings struct to use for InitLogging() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compile error Created 7 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « content/app/android/library_loader_hooks.cc ('k') | content/shell/app/shell_main_delegate.cc » ('j') | no next file with comments »
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 926 matching lines...) Expand 10 before | Expand all | Expand 10 after
937 // - Test frame size changes mid-stream 937 // - Test frame size changes mid-stream
938 938
939 } // namespace 939 } // namespace
940 } // namespace content 940 } // namespace content
941 941
942 int main(int argc, char **argv) { 942 int main(int argc, char **argv) {
943 testing::InitGoogleTest(&argc, argv); // Removes gtest-specific args. 943 testing::InitGoogleTest(&argc, argv); // Removes gtest-specific args.
944 CommandLine::Init(argc, argv); 944 CommandLine::Init(argc, argv);
945 945
946 // Needed to enable DVLOG through --vmodule. 946 // Needed to enable DVLOG through --vmodule.
947 CHECK(logging::InitLogging( 947 logging::LoggingSettings settings;
948 NULL, 948 settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
949 logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG, 949 settings.dcheck_state =
950 logging::DONT_LOCK_LOG_FILE, 950 logging::ENABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS;
951 logging::APPEND_TO_OLD_LOG_FILE, 951 CHECK(logging::InitLogging(settings));
952 logging::ENABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS));
953 952
954 CommandLine* cmd_line = CommandLine::ForCurrentProcess(); 953 CommandLine* cmd_line = CommandLine::ForCurrentProcess();
955 DCHECK(cmd_line); 954 DCHECK(cmd_line);
956 955
957 CommandLine::SwitchMap switches = cmd_line->GetSwitches(); 956 CommandLine::SwitchMap switches = cmd_line->GetSwitches();
958 for (CommandLine::SwitchMap::const_iterator it = switches.begin(); 957 for (CommandLine::SwitchMap::const_iterator it = switches.begin();
959 it != switches.end(); ++it) { 958 it != switches.end(); ++it) {
960 if (it->first == "test_video_data") { 959 if (it->first == "test_video_data") {
961 content::test_video_data = it->second.c_str(); 960 content::test_video_data = it->second.c_str();
962 continue; 961 continue;
(...skipping 10 matching lines...) Expand all
973 #elif defined(OS_CHROMEOS) 972 #elif defined(OS_CHROMEOS)
974 #if defined(ARCH_CPU_ARMEL) 973 #if defined(ARCH_CPU_ARMEL)
975 content::ExynosVideoDecodeAccelerator::PreSandboxInitialization(); 974 content::ExynosVideoDecodeAccelerator::PreSandboxInitialization();
976 #elif defined(ARCH_CPU_X86_FAMILY) 975 #elif defined(ARCH_CPU_X86_FAMILY)
977 content::VaapiWrapper::PreSandboxInitialization(); 976 content::VaapiWrapper::PreSandboxInitialization();
978 #endif // ARCH_CPU_ARMEL 977 #endif // ARCH_CPU_ARMEL
979 #endif // OS_CHROMEOS 978 #endif // OS_CHROMEOS
980 979
981 return RUN_ALL_TESTS(); 980 return RUN_ALL_TESTS();
982 } 981 }
OLDNEW
« no previous file with comments | « content/app/android/library_loader_hooks.cc ('k') | content/shell/app/shell_main_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698