Reduce noise from using du to log disk usage in feedback reports

chrome/browser/chromeos/system_logs/command_line_log_source.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.
 
 #include "chrome/browser/chromeos/system_logs/command_line_log_source.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <vector>
@@ skipping 13 matching lines @@
 
 // Gathers log data from various scripts/programs.
 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, base::CommandLine>> commands;
 
   base::CommandLine command(base::FilePath("/usr/bin/amixer"));
   command.AppendArg("-c0");
   command.AppendArg("contents");
-  commands.push_back(std::make_pair("alsa controls", command));
+  commands.emplace_back("alsa controls", command);
 
   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));
+  commands.emplace_back("cras", command);
 
   command = base::CommandLine((base::FilePath("/usr/bin/audio_diagnostics")));
-  commands.push_back(std::make_pair("audio_diagnostics", command));
+  commands.emplace_back("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 = base::CommandLine((base::FilePath("/usr/bin/cras_test_client")));
   command.AppendArg("--loopback_file");
   command.AppendArg("/dev/null");
   command.AppendArg("--rate");
   command.AppendArg("44100");
   command.AppendArg("--duration_seconds");
   command.AppendArg("0.01");
   command.AppendArg("--show_total_rms");
-  commands.push_back(std::make_pair("cras_rms", command));
+  commands.emplace_back("cras_rms", command);
 #endif
 
   command = base::CommandLine((base::FilePath("/usr/bin/printenv")));
-  commands.push_back(std::make_pair("env", command));
+  commands.emplace_back("env", command);
 
 #if defined(USE_X11)
   command = base::CommandLine(base::FilePath("/usr/bin/xrandr"));
   command.AppendArg("--verbose");
-  commands.push_back(std::make_pair("xrandr", command));
+  commands.emplace_back("xrandr", command);
 #elif defined(USE_OZONE)
   command = base::CommandLine(base::FilePath("/usr/bin/modetest"));
-  commands.push_back(std::make_pair("modetest", command));
+  commands.emplace_back("modetest", command);
 #endif
 
   // Get a list of file sizes for the whole system (excluding the names of the
   // files in the Downloads directory for privay reasons).
   if (base::SysInfo::IsRunningOnChromeOS()) {
     // The following command would hang if run in Linux Chrome OS build on a
     // Linux Workstation.
     command = base::CommandLine(base::FilePath("/bin/sh"));
     command.AppendArg("-c");
     command.AppendArg(
-        "/usr/bin/du -h / | grep -v -e \\/home\\/.*\\/Downloads\\/");
-    commands.push_back(std::make_pair("system_files", command));
+        "/usr/bin/du -h --max-depth=5 /home/ /mnt/stateful_partition/ | "
+        "grep -v -e Downloads");
+    commands.emplace_back("system_files", command);
   }
 
   // Track the list of plugged-in USB devices.
   command = base::CommandLine(base::FilePath("/bin/sh"));
   command.AppendArg("-c");
   command.AppendArg("/usr/bin/lsusb -t");
   commands.emplace_back("usb_devices", command);
 
   // Get disk space usage information
   command = base::CommandLine(base::FilePath("/bin/df"));
-  commands.push_back(std::make_pair("disk_usage", command));
+  commands.emplace_back("disk_usage", command);
 
-  for (size_t i = 0; i < commands.size(); ++i) {
-    VLOG(1) << "Executting System Logs Command: " << commands[i].first;
+  for (const auto& command : commands) {
+    VLOG(1) << "Executting System Logs Command: " << command.first;
     std::string output;
-    base::GetAppOutput(commands[i].second, &output);
-    (*response)[commands[i].first] = output;
+    base::GetAppOutput(command.second, &output);
+    response->emplace(command.first, output);
   }
 }
 
 }  // namespace
 
 namespace system_logs {
 
 CommandLineLogSource::CommandLineLogSource() : SystemLogsSource("CommandLine") {
 }
 
 CommandLineLogSource::~CommandLineLogSource() {
 }
 
 void CommandLineLogSource::Fetch(const SysLogsSourceCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(!callback.is_null());
 
   SystemLogsResponse* response = new SystemLogsResponse;
   base::PostTaskWithTraitsAndReply(FROM_HERE,
                                    base::TaskTraits().MayBlock().WithPriority(
                                        base::TaskPriority::BACKGROUND),
                                    base::Bind(&ExecuteCommandLines, response),
                                    base::Bind(callback, base::Owned(response)));
 }
 
 }  // namespace system_logs