Include full du dump 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>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/process/launch.h"
+#include "base/sys_info.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace {
 
 // 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.
@@ skipping 32 matching lines @@
 
 #if defined(USE_X11)
   command = base::CommandLine(base::FilePath("/usr/bin/xrandr"));
   command.AppendArg("--verbose");
   commands.push_back(std::make_pair("xrandr", command));
 #elif defined(USE_OZONE)
   command = base::CommandLine(base::FilePath("/usr/bin/modetest"));
   commands.push_back(std::make_pair("modetest", command));
 #endif
 
-  // 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 = 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 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));
+  }
 
   // Get disk space usage information
   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) {
     VLOG(1) << "Executting System Logs Command: " << commands[i].first;
     std::string output;
     base::GetAppOutput(commands[i].second, &output);
     (*response)[commands[i].first] = output;
@@ skipping 15 matching lines @@
   DCHECK(!callback.is_null());
 
   SystemLogsResponse* response = new SystemLogsResponse;
   BrowserThread::PostBlockingPoolTaskAndReply(
       FROM_HERE,
       base::Bind(&ExecuteCommandLines, response),
       base::Bind(callback, base::Owned(response)));
 }
 
 }  // namespace system_logs