#include "chromeos/system/name_value_pairs_parser.h"
#include "base/command_line.h"
-#include "base/file_util.h"
#include "base/files/file_path.h"
+#include "base/files/file_util.h"
#include "base/logging.h"
#include "base/process/launch.h"
#include "base/stl_util.h"
#include "base/strings/string_tokenizer.h"
#include "base/strings/string_util.h"
+#include "base/sys_info.h"
namespace chromeos { // NOLINT
namespace system {
namespace {
-const char kQuoteChars[] = "\"";
-const char kTrimChars[] = "\" ";
-
-bool GetToolOutput(int argc, const char* argv[], std::string& output) {
+bool GetToolOutput(int argc, const char* argv[], std::string* output) {
DCHECK_GE(argc, 1);
if (!base::PathExists(base::FilePath(argv[0]))) {
std::vector<std::string> args;
for (int argn = 0; argn < argc; ++argn)
args.push_back(argv[argn]);
- if (!base::GetAppOutput(args, &output)) {
+ if (!base::GetAppOutput(args, output)) {
LOG(WARNING) << "Error executing " << argv[0];
return false;
}
bool all_valid = true;
// Set up the pair tokenizer.
base::StringTokenizer pair_toks(in_string, delim);
- pair_toks.set_quote_chars(kQuoteChars);
+ pair_toks.set_quote_chars("\"");
// Process token pairs.
while (pair_toks.GetNext()) {
std::string pair(pair_toks.token());
value_size = comment_pos - eq_pos - 1;
}
+ static const char kTrimChars[] = "\" ";
std::string key;
std::string value;
- TrimString(pair.substr(0, eq_pos), kTrimChars, &key);
- TrimString(pair.substr(eq_pos + 1, value_size), kTrimChars, &value);
+ base::TrimString(pair.substr(0, eq_pos), kTrimChars, &key);
+ base::TrimString(pair.substr(eq_pos + 1, value_size), kTrimChars, &value);
if (!key.empty()) {
AddNameValuePair(key, value);
const char* argv[],
const std::string& key) {
std::string output_string;
- if (!GetToolOutput(argc, argv, output_string))
+ if (!GetToolOutput(argc, argv, &output_string))
return false;
- TrimWhitespaceASCII(output_string, TRIM_ALL, &output_string);
+ base::TrimWhitespaceASCII(output_string, base::TRIM_ALL, &output_string);
AddNameValuePair(key, output_string);
return true;
}
if (base::ReadFileToString(file_path, &contents)) {
return ParseNameValuePairs(contents, eq, delim);
} else {
- LOG(WARNING) << "Unable to read statistics file: " << file_path.value();
+ if (base::SysInfo::IsRunningOnChromeOS())
+ VLOG(1) << "Statistics file not present: " << file_path.value();
return false;
}
}
const std::string& delim,
const std::string& comment_delim) {
std::string output_string;
- if (!GetToolOutput(argc, argv, output_string))
+ if (!GetToolOutput(argc, argv, &output_string))
return false;
return ParseNameValuePairsWithComments(