Generalizing conditional compilation logic for systems with native utf8 locale.

base/files/file_path.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/files/file_path.h"
 
 #include <string.h>
 #include <algorithm>
 
 #include "base/basictypes.h"
@@ skipping 575 matching lines @@
   return WideToUTF16(SysNativeMBToWide(path_));
 }
 
 std::string FilePath::MaybeAsASCII() const {
   if (base::IsStringASCII(path_))
     return path_;
   return std::string();
 }
 
 std::string FilePath::AsUTF8Unsafe() const {
-#if defined(OS_MACOSX) || defined(OS_CHROMEOS)
+#if defined(SYSTEM_NATIVE_UTF8)
   return value();
 #else
   return WideToUTF8(SysNativeMBToWide(value()));
 #endif
 }
 
 string16 FilePath::AsUTF16Unsafe() const {
-#if defined(OS_MACOSX) || defined(OS_CHROMEOS)
+#if defined(SYSTEM_NATIVE_UTF8)
   return UTF8ToUTF16(value());
 #else
   return WideToUTF16(SysNativeMBToWide(value()));
 #endif
 }
 
 // static
 FilePath FilePath::FromUTF8Unsafe(const std::string& utf8) {
-#if defined(OS_MACOSX) || defined(OS_CHROMEOS)
+#if defined(SYSTEM_NATIVE_UTF8)
   return FilePath(utf8);
 #else
   return FilePath(SysWideToNativeMB(UTF8ToWide(utf8)));
 #endif
 }
 
 // static
 FilePath FilePath::FromUTF16Unsafe(const string16& utf16) {
-#if defined(OS_MACOSX) || defined(OS_CHROMEOS)
+#if defined(SYSTEM_NATIVE_UTF8)
   return FilePath(UTF16ToUTF8(utf16));
 #else
   return FilePath(SysWideToNativeMB(UTF16ToWide(utf16)));
 #endif
 }
 
 #elif defined(OS_WIN)
 string16 FilePath::LossyDisplayName() const {
   return path_;
 }
@@ skipping 682 matching lines @@
 bool FilePath::IsContentUri() const {
   return StartsWithASCII(path_, "content://", false /*case_sensitive*/);
 }
 #endif
 
 }  // namespace base
 
 void PrintTo(const base::FilePath& path, std::ostream* out) {
   *out << path.value();
 }