Cleanup: Use base/files/file_util.h instead of base/file_util.h in ash/, athena/, and chromeos/

chromeos/system/name_value_pairs_parser.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 "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 {
 
-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]))) {
     LOG(WARNING) << "Tool for statistics not found: " << argv[0];
     return false;
   }
 
   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;
   }
 
   return true;
 }
 
 }  // namespace
 
 NameValuePairsParser::NameValuePairsParser(NameValueMap* map)
@@ skipping 58 matching lines @@
     LOG(WARNING) << "Invalid token pair: " << pair << ". Ignoring.";
     all_valid = false;
   }
   return all_valid;
 }
 
 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);
   AddNameValuePair(key, output_string);
   return true;
 }
 
 bool NameValuePairsParser::GetNameValuePairsFromFile(
     const base::FilePath& file_path,
     const std::string& eq,
     const std::string& delim) {
   std::string contents;
   if (base::ReadFileToString(file_path, &contents)) {
     return ParseNameValuePairs(contents, eq, delim);
   } else {
     if (base::SysInfo::IsRunningOnChromeOS())
       VLOG(1) << "Statistics file not present: " << file_path.value();
     return false;
   }
 }
 
 bool NameValuePairsParser::ParseNameValuePairsFromTool(
     int argc,
     const char* argv[],
     const std::string& eq,
     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(
       output_string, eq, delim, comment_delim);
 }
 
 }  // namespace system
 }  // namespace chromeos