Refactoring the SysInfoProvider.

chrome/browser/chromeos/system_logs/command_line_log_source.cc

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
new file mode 100644
index 0000000000000000000000000000000000000000..5b4a283f9f9cad068fb5dfc1aeb199936e28afea
--- /dev/null
+++ b/chrome/browser/chromeos/system_logs/command_line_log_source.cc
@@ -0,0 +1,70 @@
+// 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 <string>
+#include <vector>
+
+#include "base/command_line.h"
+#include "base/file_path.h"
+#include "base/process_util.h"
+#include "content/public/browser/browser_thread.h"
+
+using content::BrowserThread;
+
+namespace {
+
+// Gathers log data from various scripts/programs.
+void ExecuteCommandLines(chromeos::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;
+
+  // Needed to initialize an empty command, but the constructor was private
+  CommandLine command(FilePath("/usr/bin/cras_test_client"));
+  command.AppendArg("--dump_server_info");
+  commands.push_back(std::make_pair("cras", command));
+
+  command = CommandLine((FilePath("set")));
+  commands.push_back(std::make_pair("env", command));
+
+  command = CommandLine(FilePath("/usr/bin/setxkbmap"));
+  command.AppendArg("-print");
+  command.AppendArg("-query");
+  commands.push_back(std::make_pair("setxkbmap", command));
+
+  command = CommandLine(FilePath("/usr/bin/xrandr"));
+  command.AppendArg("--verbose");
+  commands.push_back(std::make_pair("xrandr", command));
+
+  command = CommandLine(FilePath("/opt/google/touchpad/tpcontrol"));
+  commands.push_back(std::make_pair("hack-33025-touchpad", command));
+
+  command = CommandLine(FilePath("/opt/google/touchpad/generate_userfeedback"));
+  commands.push_back(std::make_pair("hack-33025-touchpad_activity", command));
+
+  for (size_t i = 0; i < commands.size(); ++i) {
+    std::string output;
+    base::GetAppOutput(commands[i].second, &output);
+    (*response)[commands[i].first] = output;
+  }
+}
+
+}  // namespace
+
+namespace chromeos {
+
+void CommandLineLogSource::Fetch(const SysLogsSourceCallback& callback) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK(!callback.is_null());
+
+  SystemLogsResponse* response = new SystemLogsResponse;
+  BrowserThread::PostBlockingPoolTaskAndReply(
+      FROM_HERE,
+      base::Bind(&ExecuteCommandLines, response),

[Lei Zhang, 2012/08/21 21:42:50]

You removed base/bind.h even though you actually use it here. Ditto for
base/logging.h for DCHECK().

[tudalex(Chromium), 2012/08/21 21:58:08]

Done.

+      base::Bind(callback, base::Owned(response)));
+}
+
+}  // namespace chromeos