Move GetNameValuePairsFromFile -> NameValuePairsParser, ERROR -> WARNING

chrome/browser/chromeos/system/statistics_provider.cc

 // Copyright (c) 2011 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/statistics_provider.h"
 
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
@@ skipping 32 matching lines @@
 const char kMachineOSInfoDelim[] = "\n";
 
 // Command to get VPD info and key/value delimiters.
 const char kVpdFile[] = "/var/log/vpd_2.0.txt";
 const char kVpdEq[] = "=";
 const char kVpdDelim[] = "\n";
 
 // Timeout that we should wait for statistics to get loaded
 const int kTimeoutSecs = 3;
 
-// Gets name-value paris from the file using the parser.
-void GetNameValuePairsFromFile(NameValuePairsParser* parser,
-                               const FilePath& file_path,
-                               const std::string& eq,
-                               const std::string& delim) {
-  std::string contents;
-  if (file_util::ReadFileToString(file_path, &contents)) {
-    parser->ParseNameValuePairs(contents, eq, delim);
-  }
-}
-
 }  // namespace
 
 // The StatisticsProvider implementation used in production.
 class StatisticsProviderImpl : public StatisticsProvider {
  public:
   // StatisticsProvider implementation:
   virtual bool GetMachineStatistic(const std::string& name,
                                    std::string* result);
 
   static StatisticsProviderImpl* GetInstance();
@@ skipping 61 matching lines @@
 }
 
 void StatisticsProviderImpl::LoadMachineStatistics() {
   NameValuePairsParser parser(&machine_info_);
   if (!parser.GetSingleValueFromTool(arraysize(kHardwareClassTool),
                                      kHardwareClassTool,
                                      kHardwareClassKey)) {
     // Use kUnknownHardwareClass if the hardware class command fails.
     parser.AddNameValuePair(kHardwareClassKey, kUnknownHardwareClass);
   }
-  GetNameValuePairsFromFile(&parser,
-                            FilePath(kMachineHardwareInfoFile),
-                            kMachineHardwareInfoEq,
-                            kMachineHardwareInfoDelim);
-  GetNameValuePairsFromFile(&parser,
-                            FilePath(kMachineOSInfoFile),
-                            kMachineOSInfoEq,
-                            kMachineOSInfoDelim);
-  GetNameValuePairsFromFile(&parser, FilePath(kVpdFile), kVpdEq, kVpdDelim);
+  parser.GetNameValuePairsFromFile(FilePath(kMachineHardwareInfoFile),
+                                   kMachineHardwareInfoEq,
+                                   kMachineHardwareInfoDelim);
+  parser.GetNameValuePairsFromFile(FilePath(kMachineOSInfoFile),
+                                   kMachineOSInfoEq,
+                                   kMachineOSInfoDelim);
+  parser.GetNameValuePairsFromFile(FilePath(kVpdFile), kVpdEq, kVpdDelim);
 
 #if defined(GOOGLE_CHROME_BUILD)
   // TODO(kochi): This is for providing a channel information to
   // chrome::VersionInfo::GetChannel()/GetVersionStringModifier(),
   // but this is still late for some early customers such as
   // prerender::ConfigurePrefetchAndPrerender() and
   // ThreadWatcherList::ParseCommandLine().
   // See http://crbug.com/107333 .
   const char kChromeOSReleaseTrack[] = "CHROMEOS_RELEASE_TRACK";
   std::string channel;
@@ skipping 38 matching lines @@
 StatisticsProvider* StatisticsProvider::GetInstance() {
   if (system::runtime_environment::IsRunningOnChromeOS()) {
     return StatisticsProviderImpl::GetInstance();
   } else {
     return StatisticsProviderStubImpl::GetInstance();
   }
 }
 
 }  // namespace system
 }  // namespace chromeos