Refactoring the SysInfoProvider.

chrome/browser/chromeos/syslogs/commandline_fetcher.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/syslogs/commandline_fetcher.h"
+
+#include <string>
+#include <vector>
+
+#include "base/bind.h"
+#include "base/bind_helpers.h"
+#include "base/command_line.h"
+#include "base/file_path.h"
+#include "base/file_util.h"
+#include "base/logging.h"
+#include "base/process_util.h"
+
+namespace chromeos {
+
+void CommandLineFetcher::Fetch(SysLogsFetcherCallback request)

[rkc, 2012/08/06 18:30:18]

Add a TODO here to mention that we need to move the commands to an array (or
something easier to add to than straight code) that is iterated over to run all
the command lines.

[tudalex(Chromium), 2012/08/06 19:14:22]

Done.

+{
+  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));
+
+
+  std::vector< std::pair<std::string, CommandLine> >::iterator it;
+  for (it = commands.begin(); it != commands.end(); ++it) {
+    std::string output;
+    base::GetAppOutput(it->second, &output);
+    (*response_)[it->first] = output;
+  }
+  request.Run(response_);
+}
+
+}  // namespace chromeos