Make callers of CommandLine use it via the base:: namespace.

Covers jingle/, media/, ppapi/, remoting/, rlz/, skia/, and sync/.

BUG=422426
TEST=none
TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/819203002

Cr-Commit-Position: refs/heads/master@{#309502}

jingle/glue/logging_unittest.cc

@@ -50,7 +50,7 @@ static bool ContainsString(const std::string& original,
 static bool Initialize(int verbosity_level) {
   if (verbosity_level != kDefaultVerbosity) {
     // Update the command line with specified verbosity level for this file.
-    CommandLine* command_line = CommandLine::ForCurrentProcess();
+    base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
     std::ostringstream value_stream;
     value_stream << "logging_unittest=" << verbosity_level;
     const std::string& value = value_stream.str();

media/audio/alsa/audio_manager_alsa.cc

@@ -50,7 +50,7 @@ static const char* kInvalidAudioInputDevices[] = {
 // static
 void AudioManagerAlsa::ShowLinuxAudioInputSettings() {
   scoped_ptr<base::Environment> env(base::Environment::Create());
-  CommandLine command_line(CommandLine::NO_PROGRAM);
+  base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
   switch (base::nix::GetDesktopEnvironment(env.get())) {
     case base::nix::DESKTOP_ENVIRONMENT_GNOME:
       command_line.SetProgram(base::FilePath("gnome-volume-control"));
@@ -335,9 +335,9 @@ AudioParameters AudioManagerAlsa::GetPreferredOutputStreamParameters(
 AudioOutputStream* AudioManagerAlsa::MakeOutputStream(
     const AudioParameters& params) {
   std::string device_name = AlsaPcmOutputStream::kAutoSelectDevice;
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kAlsaOutputDevice)) {
-    device_name = CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+    device_name = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
         switches::kAlsaOutputDevice);
   }
   return new AlsaPcmOutputStream(device_name, params, wrapper_.get(), this);
@@ -347,8 +347,9 @@ AudioInputStream* AudioManagerAlsa::MakeInputStream(
     const AudioParameters& params, const std::string& device_id) {
   std::string device_name = (device_id == AudioManagerBase::kDefaultDeviceId) ?
       AlsaPcmInputStream::kAutoSelectDevice : device_id;
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAlsaInputDevice)) {
-    device_name = CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kAlsaInputDevice)) {
+    device_name = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
         switches::kAlsaInputDevice);
   }
 

media/audio/audio_manager_base.cc

@@ -385,7 +385,7 @@ std::string AudioManagerBase::GetDefaultOutputDeviceID() {
 }
 
 int AudioManagerBase::GetUserBufferSize() {
-  const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
+  const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
   int buffer_size = 0;
   std::string buffer_size_str(cmd_line->GetSwitchValueASCII(
       switches::kAudioBufferSize));

media/audio/fake_audio_input_stream.cc

@@ -151,9 +151,9 @@ bool FakeAudioInputStream::Open() {
   memset(buffer_.get(), 0, buffer_size_);
   audio_bus_->Zero();
 
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kUseFileForFakeAudioCapture)) {
-    OpenInFileMode(CommandLine::ForCurrentProcess()->GetSwitchValuePath(
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kUseFileForFakeAudioCapture)) {
+    OpenInFileMode(base::CommandLine::ForCurrentProcess()->GetSwitchValuePath(
         switches::kUseFileForFakeAudioCapture));
   }
 

media/audio/linux/audio_manager_linux.cc

@@ -28,7 +28,7 @@ enum LinuxAudioIO {
 
 AudioManager* CreateAudioManager(AudioLogFactory* audio_log_factory) {
 #if defined(USE_CRAS)
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseCras)) {
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseCras)) {
     UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kCras, kAudioIOMax + 1);
     return new AudioManagerCras(audio_log_factory);
   }

media/audio/win/audio_low_latency_output_win.cc

@@ -27,7 +27,7 @@ namespace media {
 
 // static
 AUDCLNT_SHAREMODE WASAPIAudioOutputStream::GetShareMode() {
-  const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
+  const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
   if (cmd_line->HasSwitch(switches::kEnableExclusiveAudio))
     return AUDCLNT_SHAREMODE_EXCLUSIVE;
   return AUDCLNT_SHAREMODE_SHARED;

media/audio/win/audio_manager_win.cc

@@ -112,8 +112,9 @@ static base::string16 GetDeviceAndDriverInfo(HDEVINFO device_info,
 static int NumberOfWaveOutBuffers() {
   // Use the user provided buffer count if provided.
   int buffers = 0;
-  std::string buffers_str(CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-      switches::kWaveOutBuffers));
+  std::string buffers_str(
+      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+          switches::kWaveOutBuffers));
   if (base::StringToInt(buffers_str, &buffers) && buffers > 0) {
     return buffers;
   }
@@ -258,7 +259,7 @@ void AudioManagerWin::ShowAudioInputSettings() {
   base::FilePath path;
   PathService::Get(base::DIR_SYSTEM, &path);
   path = path.Append(program);
-  CommandLine command_line(path);
+  base::CommandLine command_line(path);
   command_line.AppendArg(argument);
   base::LaunchProcess(command_line, base::LaunchOptions());
 }
@@ -418,7 +419,7 @@ AudioParameters AudioManagerWin::GetPreferredOutputStreamParameters(
   DLOG_IF(ERROR, !core_audio_supported() && !output_device_id.empty())
       << "CoreAudio is required to open non-default devices.";
 
-  const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
+  const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
   ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
   int sample_rate = 48000;
   int buffer_size = kFallbackBufferSize;

media/audio/win/core_audio_util_win.cc

@@ -158,7 +158,7 @@ static std::string GetDeviceID(IMMDevice* device) {
 
 bool CoreAudioUtil::IsSupported() {
   // It is possible to force usage of WaveXxx APIs by using a command line flag.
-  const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
+  const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
   if (cmd_line->HasSwitch(switches::kForceWaveAudio)) {
     DVLOG(1) << "Forcing usage of Windows WaveXxx APIs";
     return false;
@@ -197,7 +197,7 @@ base::TimeDelta CoreAudioUtil::RefererenceTimeToTimeDelta(REFERENCE_TIME time) {
 }
 
 AUDCLNT_SHAREMODE CoreAudioUtil::GetShareMode() {
-  const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
+  const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
   if (cmd_line->HasSwitch(switches::kEnableExclusiveAudio))
     return AUDCLNT_SHAREMODE_EXCLUSIVE;
   return AUDCLNT_SHAREMODE_SHARED;

media/base/android/browser_cdm_factory_android.cc

@@ -38,7 +38,7 @@ scoped_ptr<BrowserCdm> BrowserCdmFactoryAndroid::CreateBrowserCdm(
   // TODO(xhwang/ddorwin): Pass the security level from key system.
   MediaDrmBridge::SecurityLevel security_level =
       MediaDrmBridge::SECURITY_LEVEL_3;
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kMediaDrmEnableNonCompositing)) {
     security_level = MediaDrmBridge::SECURITY_LEVEL_1;
   }

media/base/mac/avfoundation_glue.mm

@@ -126,7 +126,8 @@ bool IsAVFoundationSupportedHelper() {
     return false;
   }
 
-  const CommandLine* command_line = CommandLine::ForCurrentProcess();
+  const base::CommandLine* command_line =
+      base::CommandLine::ForCurrentProcess();
   // The force-qtkit flag takes precedence over enable-avfoundation.
   if (command_line->HasSwitch(switches::kForceQTKit)) {
     LogCaptureApi(CAPTURE_API_QTKIT_FORCED_BY_FLAG);

media/base/pipeline.cc

@@ -685,7 +685,7 @@ void Pipeline::RunEndedCallbackIfNeeded() {
 scoped_ptr<TextRenderer> Pipeline::CreateTextRenderer() {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
-  const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
+  const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
   if (!cmd_line->HasSwitch(switches::kEnableInbandTextTracks))
     return scoped_ptr<media::TextRenderer>();
 

media/cast/test/cast_benchmarks.cc

@@ -698,7 +698,7 @@ class CastBenchmark {
       threads[i]->Start();
     }
 
-    if (CommandLine::ForCurrentProcess()->HasSwitch("single-run")) {
+    if (base::CommandLine::ForCurrentProcess()->HasSwitch("single-run")) {
       SearchVector a;
       a.bitrate.base = 100.0;
       a.bitrate.grade = 1.0;
@@ -743,7 +743,7 @@ class CastBenchmark {
 
 int main(int argc, char** argv) {
   base::AtExitManager at_exit;
-  CommandLine::Init(argc, argv);
+  base::CommandLine::Init(argc, argv);
   media::cast::CastBenchmark benchmark;
   if (getenv("PROFILE_FILE")) {
     std::string profile_file(getenv("PROFILE_FILE"));

media/cast/test/receiver.cc

@@ -540,7 +540,7 @@ class NaivePlayer : public InProcessReceiver,
 
 int main(int argc, char** argv) {
   base::AtExitManager at_exit;
-  CommandLine::Init(argc, argv);
+  base::CommandLine::Init(argc, argv);
   InitLogging(logging::LoggingSettings());
 
   scoped_refptr<media::cast::CastEnvironment> cast_environment(

media/cast/test/sender.cc

@@ -249,7 +249,7 @@ void WriteStatsAndDestroySubscribers(
 
 int main(int argc, char** argv) {
   base::AtExitManager at_exit;
-  CommandLine::Init(argc, argv);
+  base::CommandLine::Init(argc, argv);
   InitLogging(logging::LoggingSettings());
 
   // Load the media module for FFmpeg decoding.
@@ -270,7 +270,7 @@ int main(int argc, char** argv) {
   base::MessageLoopForIO io_message_loop;
 
   // Default parameters.
-  CommandLine* cmd = CommandLine::ForCurrentProcess();
+  base::CommandLine* cmd = base::CommandLine::ForCurrentProcess();
   std::string remote_ip_address = cmd->GetSwitchValueASCII(kSwitchAddress);
   if (remote_ip_address.empty())
     remote_ip_address = "127.0.0.1";

media/cast/test/simulator.cc

@@ -100,7 +100,7 @@ const char kYuvOutputPath[] = "yuv-output";
 
 int GetIntegerSwitchValue(const char* switch_name, int default_value) {
   const std::string as_str =
-      CommandLine::ForCurrentProcess()->GetSwitchValueASCII(switch_name);
+      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(switch_name);
   if (as_str.empty())
     return default_value;
   int as_int;
@@ -692,7 +692,7 @@ bool IsModelValid(const NetworkSimulationModel& model) {
 }
 
 NetworkSimulationModel LoadModel(const base::FilePath& model_path) {
-  if (CommandLine::ForCurrentProcess()->HasSwitch(kNoSimulation)) {
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(kNoSimulation)) {
     NetworkSimulationModel model;
     model.set_type(media::cast::proto::NO_SIMULATION);
     return model;
@@ -726,10 +726,10 @@ NetworkSimulationModel LoadModel(const base::FilePath& model_path) {
 
 int main(int argc, char** argv) {
   base::AtExitManager at_exit;
-  CommandLine::Init(argc, argv);
+  base::CommandLine::Init(argc, argv);
   InitLogging(logging::LoggingSettings());
 
-  const CommandLine* cmd = CommandLine::ForCurrentProcess();
+  const base::CommandLine* cmd = base::CommandLine::ForCurrentProcess();
   base::FilePath media_path = cmd->GetSwitchValuePath(media::cast::kLibDir);
   if (media_path.empty()) {
     if (!PathService::Get(base::DIR_MODULE, &media_path)) {

media/cast/test/utility/input_builder.cc

@@ -29,7 +29,7 @@ InputBuilder::InputBuilder(const std::string& title,
 InputBuilder::~InputBuilder() {}
 
 std::string InputBuilder::GetStringInput() const {
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(kEnablePromptsSwitch))
+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(kEnablePromptsSwitch))
     return default_value_;
 
   printf("\n%s\n", title_.c_str());

media/cast/test/utility/tap_proxy.cc

@@ -266,7 +266,7 @@ int tun_alloc(char *dev, int flags) {
 
 int main(int argc, char **argv) {
   base::AtExitManager exit_manager;
-  CommandLine::Init(argc, argv);
+  base::CommandLine::Init(argc, argv);
   InitLogging(logging::LoggingSettings());
 
   if (argc < 4) {

media/cast/test/utility/udp_proxy_main.cc

@@ -123,7 +123,7 @@ void CheckByteCounters() {
 
 int main(int argc, char** argv) {
   base::AtExitManager at_exit;
-  CommandLine::Init(argc, argv);
+  base::CommandLine::Init(argc, argv);
   logging::LoggingSettings settings;
   settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
   InitLogging(settings);

media/filters/ffmpeg_video_decoder.cc

@@ -44,7 +44,7 @@ static int GetThreadCount(AVCodecID codec_id) {
   // Refer to http://crbug.com/93932 for tsan suppressions on decoding.
   int decode_threads = kDecodeThreads;
 
-  const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
+  const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
   std::string threads(cmd_line->GetSwitchValueASCII(switches::kVideoThreads));
   if (threads.empty() || !base::StringToInt(threads, &decode_threads))
     return decode_threads;

media/filters/gpu_video_decoder.cc

@@ -117,7 +117,7 @@ static bool IsCodedSizeSupported(const gfx::Size& coded_size) {
   // V4L2VideoDecodeAccelerator.
   base::CPU cpu;
   bool hw_large_video_support =
-      CommandLine::ForCurrentProcess()->HasSwitch(
+      base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kIgnoreResolutionLimitsForAcceleratedVideoDecode) ||
       ((cpu.vendor_name() == "GenuineIntel") && cpu.model() >= 55);
   bool os_large_video_support = true;

media/filters/vpx_video_decoder.cc

@@ -51,7 +51,7 @@ static int GetThreadCount(const VideoDecoderConfig& config) {
   // Refer to http://crbug.com/93932 for tsan suppressions on decoding.
   int decode_threads = kDecodeThreads;
 
-  const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
+  const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
   std::string threads(cmd_line->GetSwitchValueASCII(switches::kVideoThreads));
   if (threads.empty() || !base::StringToInt(threads, &decode_threads)) {
     if (config.codec() == kCodecVP9) {

media/tools/player_x11/player_x11.cc

@@ -229,8 +229,8 @@ int main(int argc, char** argv) {
   base::AtExitManager at_exit;
   media::InitializeMediaLibraryForTesting();
 
-  CommandLine::Init(argc, argv);
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
+  base::CommandLine::Init(argc, argv);
+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   std::string filename = command_line->GetSwitchValueASCII("file");
 
   if (filename.empty()) {

media/video/capture/file_video_capture_device_factory.cc

@@ -18,7 +18,7 @@ const char kFileVideoCaptureDeviceName[] =
 // Inspects the command line and retrieves the file path parameter.
 base::FilePath GetFilePathFromCommandLine() {
   base::FilePath command_line_file_path =
-      CommandLine::ForCurrentProcess()->GetSwitchValuePath(
+      base::CommandLine::ForCurrentProcess()->GetSwitchValuePath(
           switches::kUseFileForFakeVideoCapture);
   CHECK(!command_line_file_path.empty());
   return command_line_file_path;

media/video/capture/mac/video_capture_device_factory_mac_unittest.mm

@@ -14,7 +14,7 @@
 
 class VideoCaptureDeviceFactoryMacTest : public testing::Test {
   virtual void SetUp() {
-    CommandLine::ForCurrentProcess()->AppendSwitch(
+    base::CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kEnableAVFoundation);
   }
 };

media/video/capture/video_capture_device_factory.cc

@@ -14,7 +14,8 @@ namespace media {
 // static
 scoped_ptr<VideoCaptureDeviceFactory> VideoCaptureDeviceFactory::CreateFactory(
     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
-  const CommandLine* command_line = CommandLine::ForCurrentProcess();
+  const base::CommandLine* command_line =
+      base::CommandLine::ForCurrentProcess();
   // Use a Fake or File Video Device Factory if the command line flags are
   // present, otherwise use the normal, platform-dependent, device factory.
   if (command_line->HasSwitch(switches::kUseFakeDeviceForMediaStream)) {

media/video/capture/win/video_capture_device_factory_win.cc

@@ -383,7 +383,7 @@ VideoCaptureDeviceFactoryWin::VideoCaptureDeviceFactoryWin() {
   // DirectShow for any other versions, unless forced via flag. Media Foundation
   // can also be forced if appropriate flag is set and we are in Windows 7 or
   // 8 in non-Metro mode.
-  const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
+  const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
   use_media_foundation_ = (base::win::IsMetroProcess() &&
       !cmd_line->HasSwitch(switches::kForceDirectShowVideoCapture)) ||
      (base::win::GetVersion() >= base::win::VERSION_WIN7 &&

ppapi/nacl_irt/ppapi_dispatcher.cc

@@ -165,10 +165,10 @@ void PpapiDispatcher::OnMsgInitializeNaClDispatcher(
   }
 
   command_line_and_logging_initialized = true;
-  CommandLine::Init(0, NULL);
+  base::CommandLine::Init(0, NULL);
   for (size_t i = 0; i < args.switch_names.size(); ++i) {
     DCHECK(i < args.switch_values.size());
-    CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+    base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
         args.switch_names[i], args.switch_values[i]);
   }
   logging::LoggingSettings settings;

ppapi/proxy/pdf_resource.cc

@@ -28,7 +28,8 @@ namespace {
 std::string GetLocale() {
   // The browser process should have passed the locale to the plugin via the
   // --lang command line flag.
-  const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
+  const base::CommandLine& parsed_command_line =
+      *base::CommandLine::ForCurrentProcess();
   const std::string& lang = parsed_command_line.GetSwitchValueASCII("lang");
   DCHECK(!lang.empty());
   return lang;

ppapi/proxy/ppp_messaging_proxy_perftest.cc

@@ -56,7 +56,7 @@ TEST_F(PppMessagingPerfTest, StringPerformance) {
   int seed = 123;
   int string_count = 1000;
   int max_string_size = 1000000;
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   if (command_line) {
     if (command_line->HasSwitch("seed")) {
       base::StringToInt(command_line->GetSwitchValueASCII("seed"),

ppapi/shared_impl/ppapi_permissions.cc

@@ -28,7 +28,7 @@ PpapiPermissions PpapiPermissions::GetForCommandLine(uint32 base_perms) {
 #if !defined(OS_NACL)
   // Testing permissions. The testing flag implies all permissions since the
   // test plugin needs to test all interfaces.
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnablePepperTesting))
     additional_permissions |= ppapi::PERMISSION_ALL_BITS;
 #endif

remoting/codec/video_encoder_vpx.cc

@@ -334,7 +334,8 @@ VideoEncoderVpx::VideoEncoderVpx(bool use_vp9)
       active_map_height_(0) {
   if (use_vp9_) {
     // Use I444 colour space, by default, if specified on the command-line.
-    if (CommandLine::ForCurrentProcess()->HasSwitch(kEnableI444SwitchName)) {
+    if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+            kEnableI444SwitchName)) {
       SetLosslessColor(true);
     }
   }