7 files changed, 12 insertions, 12 deletions
diff --git a/media/cast/test/cast_benchmarks.cc b/media/cast/test/cast_benchmarks.cc
index c97bfc6..214f3a5 100644
--- a/media/cast/test/cast_benchmarks.cc
+++ b/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"));
diff --git a/media/cast/test/receiver.cc b/media/cast/test/receiver.cc
index 72dda69..f30e749 100644
--- a/media/cast/test/receiver.cc
+++ b/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(
diff --git a/media/cast/test/sender.cc b/media/cast/test/sender.cc
index b61bd3a..d9cee32 100644
--- a/media/cast/test/sender.cc
+++ b/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";
diff --git a/media/cast/test/simulator.cc b/media/cast/test/simulator.cc
index 10b56d1..d63f6e5 100644
--- a/media/cast/test/simulator.cc
+++ b/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)) {
diff --git a/media/cast/test/utility/input_builder.cc b/media/cast/test/utility/input_builder.cc
index 73dfb3f..6fbe506 100644
--- a/media/cast/test/utility/input_builder.cc
+++ b/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());
diff --git a/media/cast/test/utility/tap_proxy.cc b/media/cast/test/utility/tap_proxy.cc
index eac7589..6aca4f3 100644
--- a/media/cast/test/utility/tap_proxy.cc
+++ b/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) {
diff --git a/media/cast/test/utility/udp_proxy_main.cc b/media/cast/test/utility/udp_proxy_main.cc
index d2a03c6..c1e269d 100644
--- a/media/cast/test/utility/udp_proxy_main.cc
+++ b/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);