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

chrome/browser/chromeos/system/input_device_settings_impl_x11.cc

 // Copyright 2014 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.
 
 #include "chrome/browser/chromeos/system/input_device_settings.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 38 matching lines @@
   const std::string& script(argv[0]);
 
   // Script must exist on device and is of correct format.
   DCHECK(script.compare(kInputControl) == 0);
   DCHECK(!base::SysInfo::IsRunningOnChromeOS() || ScriptExists(script));
 
   if (!ScriptExists(script))
     return;
 
   base::ProcessHandle handle;
-  base::LaunchProcess(CommandLine(argv), base::LaunchOptions(), &handle);
+  base::LaunchProcess(base::CommandLine(argv), base::LaunchOptions(), &handle);
   base::EnsureProcessGetsReaped(handle);
 }
 
 void ExecuteScript(const std::vector<std::string>& argv) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   if (argv.size() == 1)
     return;
 
-  VLOG(1) << "About to launch: \"" << CommandLine(argv).GetCommandLineString()
-          << "\"";
+  VLOG(1) << "About to launch: \""
+          << base::CommandLine(argv).GetCommandLineString() << "\"";
 
   // Control scripts can take long enough to cause SIGART during shutdown
   // (http://crbug.com/261426). Run the blocking pool task with
   // CONTINUE_ON_SHUTDOWN so it won't be joined when Chrome shuts down.
   base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool();
   scoped_refptr<base::TaskRunner> runner =
       pool->GetTaskRunnerWithShutdownBehavior(
           base::SequencedWorkerPool::CONTINUE_ON_SHUTDOWN);
   runner->PostTask(FROM_HERE, base::Bind(&ExecuteScriptOnFileThread, argv));
 }
@@ skipping 19 matching lines @@
   if (!ScriptExists(kInputControl))
     return;
 
   std::vector<std::string> argv;
   argv.push_back(kInputControl);
   argv.push_back(base::StringPrintf("--type=%s", device_type));
   argv.push_back("--list");
   std::string output;
   // Output is empty if the device is not found.
   exists->data =
-      base::GetAppOutput(CommandLine(argv), &output) && !output.empty();
+      base::GetAppOutput(base::CommandLine(argv), &output) && !output.empty();
   DVLOG(1) << "DeviceExistsBlockingPool:" << device_type << "=" << exists->data;
 }
 
 void RunCallbackUIThread(
     scoped_refptr<RefCountedBool> exists,
     const InputDeviceSettings::DeviceExistsCallback& callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   DVLOG(1) << "RunCallbackUIThread " << exists->data;
   callback.Run(exists->data);
 }
@@ skipping 193 matching lines @@
 void InputDeviceSettings::SetSettingsForTesting(
     InputDeviceSettings* test_settings) {
   if (g_test_instance == test_settings)
     return;
   delete g_test_instance;
   g_test_instance = test_settings;
 }
 
 }  // namespace system
 }  // namespace chromeos