Index: chrome/browser/chromeos/system_logs/command_line_log_source.cc |
diff --git a/chrome/browser/chromeos/system_logs/command_line_log_source.cc b/chrome/browser/chromeos/system_logs/command_line_log_source.cc |
index c6b50b5b9470d26b8aff9a06cc8e4ec4ae371fdb..692cc2c0c96bb377078fe88e6f7dd7c8feea385f 100644 |
--- a/chrome/browser/chromeos/system_logs/command_line_log_source.cc |
+++ b/chrome/browser/chromeos/system_logs/command_line_log_source.cc |
@@ -22,26 +22,26 @@ namespace { |
void ExecuteCommandLines(system_logs::SystemLogsResponse* response) { |
// TODO(tudalex): Move program calling in a array or something similar to make |
// it more easier to modify and understand. |
- std::vector<std::pair<std::string, CommandLine> > commands; |
+ std::vector<std::pair<std::string, base::CommandLine>> commands; |
- CommandLine command(base::FilePath("/usr/bin/amixer")); |
+ base::CommandLine command(base::FilePath("/usr/bin/amixer")); |
command.AppendArg("-c0"); |
command.AppendArg("contents"); |
commands.push_back(std::make_pair("alsa controls", command)); |
- command = CommandLine((base::FilePath("/usr/bin/cras_test_client"))); |
+ command = base::CommandLine((base::FilePath("/usr/bin/cras_test_client"))); |
command.AppendArg("--dump_server_info"); |
command.AppendArg("--dump_audio_thread"); |
commands.push_back(std::make_pair("cras", command)); |
- command = CommandLine((base::FilePath("/usr/bin/audio_diagnostics"))); |
+ command = base::CommandLine((base::FilePath("/usr/bin/audio_diagnostics"))); |
commands.push_back(std::make_pair("audio_diagnostics", command)); |
#if 0 |
// This command hangs as of R39. TODO(alhli): Make cras_test_client more |
// robust or add a wrapper script that times out, and fix this or remove |
// this code. crbug.com/419523 |
- command = CommandLine((base::FilePath("/usr/bin/cras_test_client"))); |
+ command = base::CommandLine((base::FilePath("/usr/bin/cras_test_client"))); |
command.AppendArg("--loopback_file"); |
command.AppendArg("/dev/null"); |
command.AppendArg("--rate"); |
@@ -52,33 +52,33 @@ void ExecuteCommandLines(system_logs::SystemLogsResponse* response) { |
commands.push_back(std::make_pair("cras_rms", command)); |
#endif |
- command = CommandLine((base::FilePath("/usr/bin/printenv"))); |
+ command = base::CommandLine((base::FilePath("/usr/bin/printenv"))); |
commands.push_back(std::make_pair("env", command)); |
- command = CommandLine(base::FilePath("/usr/bin/setxkbmap")); |
+ command = base::CommandLine(base::FilePath("/usr/bin/setxkbmap")); |
command.AppendArg("-print"); |
command.AppendArg("-query"); |
commands.push_back(std::make_pair("setxkbmap", command)); |
- command = CommandLine(base::FilePath("/usr/bin/xinput")); |
+ command = base::CommandLine(base::FilePath("/usr/bin/xinput")); |
command.AppendArg("list"); |
command.AppendArg("--long"); |
commands.push_back(std::make_pair("xinput", command)); |
- command = CommandLine(base::FilePath("/usr/bin/xrandr")); |
+ command = base::CommandLine(base::FilePath("/usr/bin/xrandr")); |
command.AppendArg("--verbose"); |
commands.push_back(std::make_pair("xrandr", command)); |
// Get a list of file sizes for the logged in user (excluding the names of |
// the files in the Downloads directory for privay reasons). |
- command = CommandLine(base::FilePath("/bin/sh")); |
+ command = base::CommandLine(base::FilePath("/bin/sh")); |
command.AppendArg("-c"); |
command.AppendArg("/usr/bin/du -h /home/chronos/user |" |
" grep -v -e \\/home\\/chronos\\/user\\/Downloads\\/"); |
commands.push_back(std::make_pair("user_files", command)); |
// Get disk space usage information |
- command = CommandLine(base::FilePath("/bin/df")); |
+ command = base::CommandLine(base::FilePath("/bin/df")); |
commands.push_back(std::make_pair("disk_usage", command)); |
for (size_t i = 0; i < commands.size(); ++i) { |