diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-11 20:32:09 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-11 20:33:10 +0000 |
commit | 47927870b2846d4ebb76885d637572af018cc064 (patch) | |
tree | 6d2187b16e3674b8b219cf164429b5ceb3e54010 /content/common/gpu/media | |
parent | 7dee27d248d310f70d51b7e1729c5bd474c5b453 (diff) | |
download | chromium_src-47927870b2846d4ebb76885d637572af018cc064.zip chromium_src-47927870b2846d4ebb76885d637572af018cc064.tar.gz chromium_src-47927870b2846d4ebb76885d637572af018cc064.tar.bz2 |
Add base:: qualification to some COmmandLine references in content.
TBR=sky
Review URL: https://codereview.chromium.org/456513002
Cr-Commit-Position: refs/heads/master@{#288787}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288787 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/gpu/media')
8 files changed, 16 insertions, 16 deletions
diff --git a/content/common/gpu/media/android_video_encode_accelerator.cc b/content/common/gpu/media/android_video_encode_accelerator.cc index 83593fa..a6406c1 100644 --- a/content/common/gpu/media/android_video_encode_accelerator.cc +++ b/content/common/gpu/media/android_video_encode_accelerator.cc @@ -86,7 +86,7 @@ AndroidVideoEncodeAccelerator::GetSupportedProfiles() { std::vector<SupportedProfile> profiles; #if defined(ENABLE_WEBRTC) - const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); + const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); if (cmd_line->HasSwitch(switches::kDisableWebRtcHWEncoding)) return profiles; #endif diff --git a/content/common/gpu/media/gpu_video_encode_accelerator.cc b/content/common/gpu/media/gpu_video_encode_accelerator.cc index 52ecab8..8c12967 100644 --- a/content/common/gpu/media/gpu_video_encode_accelerator.cc +++ b/content/common/gpu/media/gpu_video_encode_accelerator.cc @@ -191,7 +191,7 @@ void GpuVideoEncodeAccelerator::CreateEncoder() { encoder_.reset(new V4L2VideoEncodeAccelerator(device.Pass())); #elif defined(ARCH_CPU_X86_FAMILY) - const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); + const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); if (cmd_line->HasSwitch(switches::kEnableVaapiAcceleratedVideoEncode)) encoder_.reset(new VaapiVideoEncodeAccelerator(gfx::GetXDisplay())); #endif diff --git a/content/common/gpu/media/rendering_helper.cc b/content/common/gpu/media/rendering_helper.cc index 3abc30e..7ee9401 100644 --- a/content/common/gpu/media/rendering_helper.cc +++ b/content/common/gpu/media/rendering_helper.cc @@ -62,7 +62,7 @@ RenderingHelperParams::~RenderingHelperParams() {} // static bool RenderingHelper::InitializeOneOff() { - CommandLine* cmd_line = CommandLine::ForCurrentProcess(); + base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); #if GL_VARIANT_GLX cmd_line->AppendSwitchASCII(switches::kUseGL, gfx::kGLImplementationDesktopName); diff --git a/content/common/gpu/media/v4l2_video_encode_accelerator.cc b/content/common/gpu/media/v4l2_video_encode_accelerator.cc index a5cb4fb..b3967ea 100644 --- a/content/common/gpu/media/v4l2_video_encode_accelerator.cc +++ b/content/common/gpu/media/v4l2_video_encode_accelerator.cc @@ -286,7 +286,7 @@ V4L2VideoEncodeAccelerator::GetSupportedProfiles() { std::vector<SupportedProfile> profiles; SupportedProfile profile; - const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); + const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); if (cmd_line->HasSwitch(switches::kEnableWebRtcHWVp8Encoding)) { profile.profile = media::VP8PROFILE_MAIN; profile.max_resolution.SetSize(1920, 1088); diff --git a/content/common/gpu/media/vaapi_h264_decoder_unittest.cc b/content/common/gpu/media/vaapi_h264_decoder_unittest.cc index b14c50b..9c7822b 100644 --- a/content/common/gpu/media/vaapi_h264_decoder_unittest.cc +++ b/content/common/gpu/media/vaapi_h264_decoder_unittest.cc @@ -350,7 +350,7 @@ TEST(VaapiH264DecoderTest, TestDecode) { int main(int argc, char** argv) { testing::InitGoogleTest(&argc, argv); // Removes gtest-specific args. - CommandLine::Init(argc, argv); + base::CommandLine::Init(argc, argv); // Needed to enable DVLOG through --vmodule. logging::LoggingSettings settings; @@ -358,11 +358,11 @@ int main(int argc, char** argv) { CHECK(logging::InitLogging(settings)); // Process command line. - CommandLine* cmd_line = CommandLine::ForCurrentProcess(); + base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); CHECK(cmd_line); - CommandLine::SwitchMap switches = cmd_line->GetSwitches(); - for (CommandLine::SwitchMap::const_iterator it = switches.begin(); + base::CommandLine::SwitchMap switches = cmd_line->GetSwitches(); + for (base::CommandLine::SwitchMap::const_iterator it = switches.begin(); it != switches.end(); ++it) { if (it->first == "input_file") { diff --git a/content/common/gpu/media/vaapi_video_encode_accelerator.cc b/content/common/gpu/media/vaapi_video_encode_accelerator.cc index fa45ca9..32f9f4f 100644 --- a/content/common/gpu/media/vaapi_video_encode_accelerator.cc +++ b/content/common/gpu/media/vaapi_video_encode_accelerator.cc @@ -109,7 +109,7 @@ std::vector<media::VideoEncodeAccelerator::SupportedProfile> VaapiVideoEncodeAccelerator::GetSupportedProfiles() { std::vector<SupportedProfile> profiles; - const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); + const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); if (!cmd_line->HasSwitch(switches::kEnableVaapiAcceleratedVideoEncode)) return profiles; diff --git a/content/common/gpu/media/video_decode_accelerator_unittest.cc b/content/common/gpu/media/video_decode_accelerator_unittest.cc index c2b77a3..071dced 100644 --- a/content/common/gpu/media/video_decode_accelerator_unittest.cc +++ b/content/common/gpu/media/video_decode_accelerator_unittest.cc @@ -1420,17 +1420,17 @@ TEST_F(VideoDecodeAcceleratorTest, TestDecodeTimeMedian) { int main(int argc, char **argv) { testing::InitGoogleTest(&argc, argv); // Removes gtest-specific args. - CommandLine::Init(argc, argv); + base::CommandLine::Init(argc, argv); // Needed to enable DVLOG through --vmodule. logging::LoggingSettings settings; settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG; CHECK(logging::InitLogging(settings)); - CommandLine* cmd_line = CommandLine::ForCurrentProcess(); + const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); DCHECK(cmd_line); - CommandLine::SwitchMap switches = cmd_line->GetSwitches(); + base::CommandLine::SwitchMap switches = cmd_line->GetSwitches(); for (CommandLine::SwitchMap::const_iterator it = switches.begin(); it != switches.end(); ++it) { if (it->first == "test_video_data") { diff --git a/content/common/gpu/media/video_encode_accelerator_unittest.cc b/content/common/gpu/media/video_encode_accelerator_unittest.cc index b07211d..9d1e3b6 100644 --- a/content/common/gpu/media/video_encode_accelerator_unittest.cc +++ b/content/common/gpu/media/video_encode_accelerator_unittest.cc @@ -1029,7 +1029,7 @@ INSTANTIATE_TEST_CASE_P( int main(int argc, char** argv) { testing::InitGoogleTest(&argc, argv); // Removes gtest-specific args. - CommandLine::Init(argc, argv); + base::CommandLine::Init(argc, argv); base::ShadowingAtExitManager at_exit_manager; scoped_ptr<base::FilePath::StringType> test_stream_data( @@ -1043,11 +1043,11 @@ int main(int argc, char** argv) { settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG; CHECK(logging::InitLogging(settings)); - CommandLine* cmd_line = CommandLine::ForCurrentProcess(); + const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); DCHECK(cmd_line); - CommandLine::SwitchMap switches = cmd_line->GetSwitches(); - for (CommandLine::SwitchMap::const_iterator it = switches.begin(); + base::CommandLine::SwitchMap switches = cmd_line->GetSwitches(); + for (base::CommandLine::SwitchMap::const_iterator it = switches.begin(); it != switches.end(); ++it) { if (it->first == "test_stream_data") { |