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

base/file_util_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 "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>
@@ skipping 1346 matching lines @@
   std::string data("hello");
   ASSERT_TRUE(file_util::WriteFile(bar, data.c_str(), data.length()));
   ASSERT_TRUE(file_util::WriteFile(baz, data.c_str(), data.length()));
   ASSERT_TRUE(file_util::WriteFile(foobar, data.c_str(), data.length()));
 
   EXPECT_TRUE(file_util::ContainsPath(foo, bar));
   EXPECT_FALSE(file_util::ContainsPath(foo, baz));
   EXPECT_FALSE(file_util::ContainsPath(foo, foobar));
   EXPECT_FALSE(file_util::ContainsPath(foo, foo));
 
-// Platform-specific concerns
+  // Platform-specific concerns.
   FilePath foo_caps(data_dir.Append(FILE_PATH_LITERAL("FOO")));
 #if defined(OS_WIN)
   EXPECT_TRUE(file_util::ContainsPath(foo,
       foo_caps.Append(FILE_PATH_LITERAL("bar.txt"))));
   EXPECT_TRUE(file_util::ContainsPath(foo,
       FilePath(foo.value() + FILE_PATH_LITERAL("/bar.txt"))));
-#elif defined(OS_LINUX)
+#elif defined(OS_MACOSX)
+  // We can't really do this test on OS X since the case-sensitivity of the
+  // filesystem is configurable.
+#elif defined(OS_POSIX)
   EXPECT_FALSE(file_util::ContainsPath(foo,
       foo_caps.Append(FILE_PATH_LITERAL("bar.txt"))));
-#else
-  // We can't really do this test on osx since the case-sensitivity of the
-  // filesystem is configurable.
 #endif
 }
 
 }  // namespace