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

content/shell/android/browsertests_apk/content_browser_tests_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This class sets up the environment for running the content browser tests
 // inside an android application.
 
 #include <android/log.h>
 #include <unistd.h>
 
@@ skipping 40 matching lines @@
 namespace content {
 
 // TODO(nileshagrawal): Refactor and deduplicate with
 // testing/android/native_test_launcher.cc
 static void RunTests(JNIEnv* env,
                      jobject obj,
                      jstring jfiles_dir,
                      jobject app_context) {
   // Command line basic initialization, will be fully initialized later.
   static const char* const kInitialArgv[] = { "ContentBrowserTestsActivity" };
-  CommandLine::Init(arraysize(kInitialArgv), kInitialArgv);
+  base::CommandLine::Init(arraysize(kInitialArgv), kInitialArgv);
 
   // Set the application context in base.
   base::android::ScopedJavaLocalRef<jobject> scoped_context(
       env, env->NewLocalRef(app_context));
   base::android::InitApplicationContext(env, scoped_context);
   base::android::RegisterJni(env);
 
   std::vector<std::string> args;
   ParseArgsFromCommandLineFile(kCommandLineFilePath, &args);
 
   std::vector<char*> argv;
   int argc = ArgsToArgv(args, &argv);
 
   // Fully initialize command line with arguments.
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
-  command_line->AppendArguments(CommandLine(argc, &argv[0]), false);
+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+  command_line->AppendArguments(base::CommandLine(argc, &argv[0]), false);
 
   // Append required switches.
   command_line->AppendSwitch(content::kSingleProcessTestsFlag);
   command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream);
   command_line->AppendSwitch(switches::kUseFakeUIForMediaStream);
   // Specify a socket name to not conflict with the default one used
   // in content_shell.
   command_line->AppendSwitchASCII(switches::kRemoteDebuggingSocketName,
                                   "content_browsertests_devtools_remote");
 
@@ skipping 26 matching lines @@
 
   if (!content::NestedMessagePumpAndroid::RegisterJni(env))
     return -1;
 
   if (!content::RegisterNativesImpl(env))
     return -1;
 
   content::SetContentMainDelegate(new content::ShellMainDelegate());
   return JNI_VERSION_1_4;
 }