Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chromeos / system / name_value_pairs_parser.cc

diff --git a/src/chromeos/system/name_value_pairs_parser.cc b/src/chromeos/system/name_value_pairs_parser.cc
index 39b852b..bd565f7 100644 (file)
--- a/src/chromeos/system/name_value_pairs_parser.cc
+++ b/src/chromeos/system/name_value_pairs_parser.cc
@@ -5,8 +5,8 @@
 #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"
@@ -19,10 +19,7 @@ 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]))) {
@@ -33,7 +30,7 @@ bool GetToolOutput(int argc, const char* argv[], std::string& output) {
   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;
   }
@@ -72,7 +69,7 @@ bool NameValuePairsParser::ParseNameValuePairsWithComments(
   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());
@@ -90,6 +87,7 @@ bool NameValuePairsParser::ParseNameValuePairsWithComments(
           value_size = comment_pos - eq_pos - 1;
       }
 
+      static const char kTrimChars[] = "\" ";
       std::string key;
       std::string value;
       base::TrimString(pair.substr(0, eq_pos), kTrimChars, &key);
@@ -111,7 +109,7 @@ bool NameValuePairsParser::GetSingleValueFromTool(int argc,
                                                   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;
 
   base::TrimWhitespaceASCII(output_string, base::TRIM_ALL, &output_string);
@@ -128,7 +126,7 @@ bool NameValuePairsParser::GetNameValuePairsFromFile(
     return ParseNameValuePairs(contents, eq, delim);
   } else {
     if (base::SysInfo::IsRunningOnChromeOS())
-      LOG(WARNING) << "Unable to read statistics file: " << file_path.value();
+      VLOG(1) << "Statistics file not present: " << file_path.value();
     return false;
   }
 }
@@ -140,7 +138,7 @@ bool NameValuePairsParser::ParseNameValuePairsFromTool(
     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(