Changes to base/ from a combination of FreeBSD and OpenBSD patches.

base/i18n/file_util_icu_unittest.cc

 // Copyright (c) 2009 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/i18n/file_util_icu.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 17 matching lines @@
     PlatformTest::TearDown();
     // Clean up test directory
     ASSERT_TRUE(file_util::Delete(test_dir_, true));
     ASSERT_FALSE(file_util::PathExists(test_dir_));
   }
 
   // the path to temporary directory used to contain the test operations
   FilePath test_dir_;
 };
 
-#if defined(OS_LINUX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
 
 // Linux disallows some evil ASCII characters, but passes all non-ASCII.
 static const struct goodbad_pair {
   const char* bad_name;
   const char* good_name;
 } kIllegalCharacterCases[] = {
   {"bad*file:name?.jpg", "bad-file-name-.jpg"},
   {"**********::::.txt", "--------------.txt"},
   {"\xe9\xf0zzzz.\xff", "\xe9\xf0zzzz.\xff"},
 };
@@ skipping 47 matching lines @@
 #elif defined(OS_MACOSX)
     std::string bad_name(WideToUTF8(kIllegalCharacterCases[i].bad_name));
     file_util::ReplaceIllegalCharactersInPath(&bad_name, '-');
     EXPECT_EQ(WideToUTF8(kIllegalCharacterCases[i].good_name), bad_name);
 #endif
   }
 }
 
 #endif