Convert base dependencies to use sys_string_conversions instead of the ICU...

base/sys_info_posix.cc

 // Copyright (c) 2008 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/file_util.h"
 #include "base/sys_info.h"
-#include "base/basictypes.h"
 
 #include <errno.h>
 #include <string.h>
 #include <sys/statvfs.h>
 #include <sys/utsname.h>
 #include <unistd.h>
 
 #if defined(OS_MACOSX)
 #include <ApplicationServices/ApplicationServices.h>
 #include <mach/mach_host.h>
 #include <mach/mach_init.h>
 #endif
 
 #if defined(OS_OPENBSD)
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #endif
 
+#include "base/basictypes.h"
+#include "base/file_util.h"
 #include "base/logging.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 
 namespace base {
 
 int SysInfo::NumberOfProcessors() {
 #if defined(OS_OPENBSD)
   int mib[] = { CTL_HW, HW_NCPU };
   int ncpu;
   size_t size = sizeof(ncpu);
   if (sysctl(mib, 2, &ncpu, &size, NULL, 0) == -1) {
     NOTREACHED();
@@ skipping 60 matching lines @@
 bool SysInfo::HasEnvVar(const wchar_t* var) {
   std::string var_utf8 = WideToUTF8(std::wstring(var));
   return getenv(var_utf8.c_str()) != NULL;
 }
 
 // static
 std::wstring SysInfo::GetEnvVar(const wchar_t* var) {
   std::string var_utf8 = WideToUTF8(std::wstring(var));
   char* value = getenv(var_utf8.c_str());
   if (!value) {
-    return L"";
+    return std::wstring();
   } else {
     return UTF8ToWide(value);
   }
 }
 
 // static
 std::string SysInfo::OperatingSystemName() {
   utsname info;
   if (uname(&info) < 0) {
     NOTREACHED();
@@ skipping 97 matching lines @@
     file_util::ReadFileToString(FilePath("/proc/sys/kernel/shmmax"), &contents);
     limit = strtoul(contents.c_str(), NULL, 0);
     limit_valid = true;
   }
 
   return limit;
 }
 #endif
 
 }  // namespace base