Move more file_util functions to base namespace.

base/sys_info_chromeos.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 "base/sys_info.h"
 
 #include "base/basictypes.h"
 #include "base/environment.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
@@ skipping 38 matching lines @@
   }
 
   void Parse() {
     lsb_release_map_.clear();
     major_version_ = 0;
     minor_version_ = 0;
     bugfix_version_ = 0;
     is_running_on_chromeos_ = false;
 
     std::string lsb_release, lsb_release_time_str;
-    scoped_ptr<base::Environment> env(base::Environment::Create());
+    scoped_ptr<Environment> env(Environment::Create());
     bool parsed_from_env =
         env->GetVar(kLsbReleaseKey, &lsb_release) &&
         env->GetVar(kLsbReleaseTimeKey, &lsb_release_time_str);
     if (parsed_from_env) {
       double us = 0;
       if (StringToDouble(lsb_release_time_str, &us))
-        lsb_release_time_ = base::Time::FromDoubleT(us);
+        lsb_release_time_ = Time::FromDoubleT(us);
     } else {
       // If the LSB_RELEASE and LSB_RELEASE_TIME environment variables are not
       // set, fall back to a blocking read of the lsb_release file. This should
       // only happen in non Chrome OS environments.
       ThreadRestrictions::ScopedAllowIO allow_io;
       FilePath path(kLinuxStandardBaseReleaseFile);
       ReadFileToString(path, &lsb_release);
-      base::PlatformFileInfo fileinfo;
-      if (file_util::GetFileInfo(path, &fileinfo))
+      PlatformFileInfo fileinfo;
+      if (GetFileInfo(path, &fileinfo))
         lsb_release_time_ = fileinfo.creation_time;
     }
     ParseLsbRelease(lsb_release);
     // For debugging:
     lsb_release_map_[kLsbReleaseSourceKey] =
         parsed_from_env ? kLsbReleaseSourceEnv : kLsbReleaseSourceFile;
   }
 
   bool GetLsbReleaseValue(const std::string& key, std::string* value) {
     SysInfo::LsbReleaseMap::const_iterator iter = lsb_release_map_.find(key);
     if (iter == lsb_release_map_.end())
       return false;
     *value = iter->second;
     return true;
   }
 
   void GetVersionNumbers(int32* major_version,
                          int32* minor_version,
                          int32* bugfix_version) {
     *major_version = major_version_;
     *minor_version = minor_version_;
     *bugfix_version = bugfix_version_;
   }
 
-  const base::Time& lsb_release_time() const { return lsb_release_time_; }
+  const Time& lsb_release_time() const { return lsb_release_time_; }
   const SysInfo::LsbReleaseMap& lsb_release_map() const {
     return lsb_release_map_;
   }
   bool is_running_on_chromeos() const { return is_running_on_chromeos_; }
 
  private:
   void ParseLsbRelease(const std::string& lsb_release) {
     // Parse and cache lsb_release key pairs. There should only be a handful
     // of entries so the overhead for this will be small, and it can be
     // useful for debugging.
     std::vector<std::pair<std::string, std::string> > pairs;
-    base::SplitStringIntoKeyValuePairs(lsb_release, '=', '\n', &pairs);
+    SplitStringIntoKeyValuePairs(lsb_release, '=', '\n', &pairs);
     for (size_t i = 0; i < pairs.size(); ++i) {
       std::string key, value;
       TrimWhitespaceASCII(pairs[i].first, TRIM_ALL, &key);
       TrimWhitespaceASCII(pairs[i].second, TRIM_ALL, &value);
       if (key.empty())
         continue;
       lsb_release_map_[key] = value;
     }
     // Parse the version from the first matching recognized version key.
     std::string version;
@@ skipping 21 matching lines @@
     if (GetLsbReleaseValue(kChromeOsReleaseNameKey, &release_name)) {
       for (size_t i = 0; i < arraysize(kChromeOsReleaseNames); ++i) {
         if (release_name == kChromeOsReleaseNames[i]) {
           is_running_on_chromeos_ = true;
           break;
         }
       }
     }
   }
 
-  base::Time lsb_release_time_;
+  Time lsb_release_time_;
   SysInfo::LsbReleaseMap lsb_release_map_;
   int32 major_version_;
   int32 minor_version_;
   int32 bugfix_version_;
   bool is_running_on_chromeos_;
 };
 
 static LazyInstance<ChromeOSVersionInfo>
     g_chrome_os_version_info = LAZY_INSTANCE_INITIALIZER;
 
@@ skipping 24 matching lines @@
 // static
 std::string SysInfo::GetLsbReleaseBoard() {
   const char kMachineInfoBoard[] = "CHROMEOS_RELEASE_BOARD";
   std::string board;
   if (!GetLsbReleaseValue(kMachineInfoBoard, &board))
     board = "unknown";
   return board;
 }
 
 // static
-base::Time SysInfo::GetLsbReleaseTime() {
+Time SysInfo::GetLsbReleaseTime() {
   return GetChromeOSVersionInfo().lsb_release_time();
 }
 
 // static
 bool SysInfo::IsRunningOnChromeOS() {
   return GetChromeOSVersionInfo().is_running_on_chromeos();
 }
 
 // static
 void SysInfo::SetChromeOSVersionInfoForTest(const std::string& lsb_release,
                                             const Time& lsb_release_time) {
-  scoped_ptr<base::Environment> env(base::Environment::Create());
+  scoped_ptr<Environment> env(Environment::Create());
   env->SetVar(kLsbReleaseKey, lsb_release);
   env->SetVar(kLsbReleaseTimeKey,
-              base::DoubleToString(lsb_release_time.ToDoubleT()));
+              DoubleToString(lsb_release_time.ToDoubleT()));
   g_chrome_os_version_info.Get().Parse();
 }
 
 }  // namespace base